From 425fafb05723a299a5eaa0f6d801f87bdf7141fa Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 6 Apr 2017 14:19:52 +0100
Subject: Android fastrenderers (#845)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Obsolete IVisualElementRenderer.ViewGroup in favor of .View

* Fix NRE

* Changing TContainer in PlatformEffect to View

* Fix "View" type

* new VisualElementRenderer

* First attempt at a fast(er) button renderer

* Fast Label Renderer

* Let's try that again. Behold: Label Fast Renderer

* Move FrameRenderer into Fast Renderers

* Fix Disposable on VisualElementRenderer

* Simplify touch and click handlers

* Drop empty if clause

* [Android] Add initial Image fast renderer

* Split accessibility out to a separate helper class; fix tapgesture bug with label

* [Android] Small fixes to VisualElementRenderer

* Move accessiblity stuff to a separate class (which needs a good name)

* Prevent query from looking to parent for fast renderers

* [Android] ImageRenderer refactoring

* Fix elevation/z-index bugs with Button (e.g., 40173)

* Move SetLabeledBy to Accessibilitizer

* Un-break automation IDs for Labels

* Move gesture handling to its own class

* Split gesture and effect management into separate classes

* Remove unneeded packager from LabelRenderer

* LabelRenderer inherits from FormsTextView

* Batch updates to View

* Fix isOnParentRenderer check for non-Android platforms

* [Controls] Update Xamarin.Forms.ControlGallery.iOS.csproj

* [Android,IOS] Small fixes to rebase and use of Internals

* [Android] Ignroe warning for now

* Fast renderers now passing InputTransparent and IsEnabled tests

* Fast and legacy renderers now pass the Enabled and InputTransparent tests

* Change PlatformEffect back, default container to null

* Fix mangled using directives
---
 .../Remotes/BaseViewContainerRemote.cs                     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Xamarin.Forms.Core.UITests.Shared')

diff --git a/Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs b/Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs
index 6a784e20..000cdae8 100644
--- a/Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs
+++ b/Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs
@@ -125,10 +125,16 @@ namespace Xamarin.Forms.Core.UITests
 			bool isOnParentRenderer = property.Item2;
 
 			var query = ViewQuery;
-			if (isOnParentRenderer &&
-				PlatformViewType != PlatformViews.BoxView &&
-				PlatformViewType != PlatformViews.Frame)
-			{
+			if (isOnParentRenderer && 
+				PlatformViewType != PlatformViews.BoxView && 
+				PlatformViewType != PlatformViews.Frame
+#if __ANDROID__
+				&&
+				PlatformViewType != PlatformViews.Button &&
+				PlatformViewType != PlatformViews.Label &&
+				PlatformViewType != PlatformViews.Image
+#endif               
+				) {
 				query = query + " parent * index:0";
 			}
 
-- 
cgit v1.2.3