[Android] DatePicker unfocuses on cancel (#204)

The DatePicker in Android would remain focused when being closed via the
cancel button, and a subsequent re-focus via something such as button
would not function as expected.

2 files changed, 62 insertions, 0 deletions

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs
new file mode 100644
index 00000000..87386965
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs
@@ -0,0 +1,61 @@
+using System;
+
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Bugzilla, 41424, "[Android] Clicking cancel on a DatePicker does not cause it to unfocus", PlatformAffected.Android)]
+	public class Bugzilla41424 : TestContentPage
+	{
+		const string DatePicker = "DatePicker";
+
+		protected override void Init()
+		{
+			var datePicker = new DatePicker
+			{
+				AutomationId = DatePicker
+			};
+			var datePickerFocusButton = new Button
+			{
+				Text = "Click to focus DatePicker",
+				Command = new Command(() => datePicker.Focus())
+			};
+			Content = new StackLayout
+			{
+				Children =
+				{
+					datePicker,
+					datePickerFocusButton
+				}
+			};
+		}
+
+#if UITEST
+
+#if __ANDROID__
+		[Test]
+		public void DatePickerCancelShouldUnfocus()
+		{
+			RunningApp.Tap(q => q.Marked(DatePicker));
+			RunningApp.WaitForElement(q => q.Marked("Cancel"));
+
+			RunningApp.Tap(q => q.Marked("Cancel"));
+			RunningApp.WaitForElement(q => q.Marked("Click to focus DatePicker"));
+
+			RunningApp.Tap(q => q.Marked("Click to focus DatePicker"));
+			RunningApp.WaitForElement(q => q.Marked("Cancel"));
+
+			RunningApp.Tap(q => q.Marked("Cancel"));
+		}
+#endif
+		
+#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 1e9d1ea0..c857bbb9 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
@@ -106,6 +106,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla31806.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla41078.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla40998.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla41424.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CarouselAsync.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla34561.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla34727.cs" />