From f167024ef3a02c199c797b5313342dbe5d9a21de Mon Sep 17 00:00:00 2001 From: Paul DiPietro Date: Mon, 11 Jul 2016 13:12:58 -0400 Subject: Fix DatePicker dialog regression (#249) KitKat doesn't use the cancel button, so it has to be accounted for. --- .../Renderers/DatePickerRenderer.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs index 328336ff..73e5183f 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs @@ -31,7 +31,9 @@ namespace Xamarin.Forms.Platform.Android _disposed = true; if (_dialog != null) { - _dialog.CancelEvent -= OnCancelButtonClicked; + if (Forms.IsLollipopOrNewer) + _dialog.CancelEvent -= OnCancelButtonClicked; + _dialog.Hide(); _dialog.Dispose(); _dialog = null; @@ -85,7 +87,10 @@ namespace Xamarin.Forms.Platform.Android _dialog.Hide(); ((IElementController)Element).SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false); Control.ClearFocus(); - _dialog.CancelEvent -= OnCancelButtonClicked; + + if (Forms.IsLollipopOrNewer) + _dialog.CancelEvent -= OnCancelButtonClicked; + _dialog = null; } } @@ -99,7 +104,9 @@ namespace Xamarin.Forms.Platform.Android ((IElementController)view).SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false); Control.ClearFocus(); - _dialog.CancelEvent -= OnCancelButtonClicked; + if (Forms.IsLollipopOrNewer) + _dialog.CancelEvent -= OnCancelButtonClicked; + _dialog = null; }, year, month, day); } @@ -128,7 +135,9 @@ namespace Xamarin.Forms.Platform.Android UpdateMinimumDate(); UpdateMaximumDate(); - _dialog.CancelEvent += OnCancelButtonClicked; + if (Forms.IsLollipopOrNewer) + _dialog.CancelEvent += OnCancelButtonClicked; + _dialog.Show(); } -- cgit v1.2.3