Prevent double time/date picker dialogs on Android when setting focus (…

…#3899)
xamarin · Sep 26, 2018 · 1c36e35 · 1c36e35
1 parent e3e4c7c
commit 1c36e35
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs
@@ -170,6 +170,11 @@ void DeviceInfoPropertyChanged(object sender, PropertyChangedEventArgs e)
 
 		void OnTextFieldClicked()
 		{
+			if (_dialog != null && _dialog.IsShowing)
+			{
+				return;
+			}
+
 			DatePicker view = Element;
 			((IElementController)view).SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, true);
 

diff --git a/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs
@@ -145,6 +145,11 @@ protected virtual TimePickerDialog CreateTimePickerDialog(int hours, int minutes
 
 		void OnClick()
 		{
+			if (_dialog != null && _dialog.IsShowing)
+			{
+				return;
+			}
+
 			TimePicker view = Element;
 			ElementController.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, true);