From 565973a42fc2b6a86dd50fbf2bf6d843b3c6f5e9 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 15 Aug 2017 16:39:02 +0100 Subject: [Android] Fix missing shadow on Button fast renderer (#1034) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Android] Fix missing shadow on Button fast renderer * [Android] Fix z index on Loplipop * [Android] Make sure we don't hit NRE when updating background * [Android] Fix possible NRE on BackgroundTracker * [Android] Remove elevation fix * [Android] Set elevation in Android Views if needed * [Android] Add UITest for button on fast renderes * [Controls] New test for elevation with fast renderer button --- .../ButtonFastRendererTest.cs | 43 ++++++++++++++++++++++ .../Xamarin.Forms.Controls.Issues.Shared.projitems | 1 + 2 files changed, 44 insertions(+) create mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs (limited to 'Xamarin.Forms.Controls.Issues') diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs new file mode 100644 index 00000000..4f768192 --- /dev/null +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs @@ -0,0 +1,43 @@ +using System; +using Xamarin.Forms.CustomAttributes; +using Xamarin.Forms.Internals; + +#if UITEST +using NUnit.Framework; +using Xamarin.UITest; +#endif + +namespace Xamarin.Forms.Controls.Issues +{ + [Preserve(AllMembers = true)] + [Issue(IssueTracker.None, 9999, "Button FastRenderers", PlatformAffected.All)] + public class ButtonFastRendererTest : TestContentPage + { + const string Running = "Running..."; + const string Success = "Success"; + const string Failure = "Failure"; + const string btnId = "btnHello"; + protected override void Init() + { + var label = new Label { Text = Running }; + var img = new Image { Source = "cover1.jpg", HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center }; + var btn = new Button { AutomationId = btnId, Text = "hello", HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center }; + btn.Clicked += (sender, e) => { label.Text = Success; }; + var grd = new Grid(); + grd.Children.Add(btn); + grd.Children.Add(img); + grd.Children.Add(label); + Content = grd; + } + +#if UITEST + [Test] + public void TestButtonUsingElevation () + { + RunningApp.WaitForElement(Running); + RunningApp.Tap(btnId); + RunningApp.WaitForNoElement(Success); + } +#endif + } +} diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems index e2d574f7..fe99642d 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems @@ -588,6 +588,7 @@ + -- cgit v1.2.3