[Android] Fix focus/unfocus behavior on both Picker renderers (#264)

On AppCompat, focus and unfocus would not trigger when using the Picker. On pre-Lollipop, unfocus would not trigger, but only when tapping outside of the dialog.
xamarin · Jul 26, 2016 · ea01c07 · ea01c07
1 parent d04a4a3
commit ea01c07
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Xamarin.Forms.Platform.Android/AppCompat/PickerRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/PickerRenderer.cs
@@ -102,12 +102,15 @@ void OnClick()
 					builder.SetItems(items, (s, e) => ((IElementController)model).SetValueFromRenderer(Picker.SelectedIndexProperty, e.Which));
 
 					builder.SetNegativeButton(global::Android.Resource.String.Cancel, (o, args) => { });
+
+					((IElementController)Element).SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, true);
 
 					_dialog = builder.Create();
 				}
 				_dialog.SetCanceledOnTouchOutside(true);
 				_dialog.DismissEvent += (sender, args) =>
 				{
+					((IElementController)Element).SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false);
 					_dialog.Dispose();
 					_dialog = null;
 				};

diff --git a/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs
@@ -133,7 +133,12 @@ void OnClick()
 				_dialog = null;
 			});
 
-			(_dialog = builder.Create()).Show();
+			_dialog = builder.Create();
+			_dialog.DismissEvent += (sender, args) =>
+			{
+				ElementController.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false);
+			};
+			_dialog.Show();
 		}
 
 		void RowsCollectionChanged(object sender, EventArgs e)