[Android] Prevent Picker from Gaining Focus on Touch (#29068)

* make picker not focisable

# Conflicts:
#	src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt

* Address review comments

* set keylistner to null

* Make sure Focus()/Unfocus() works

* Address review comments

* Remove IsFocused Checks

Author: bhavanesh2001

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue2339.cs

@@ -1,7 +1,6 @@
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
-
 namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	public class Issue2339 : _IssuesUITest

src/Core/src/Handlers/Picker/PickerHandler.Android.cs

@@ -19,15 +19,13 @@ protected override MauiPicker CreatePlatformView() =>
 
 		protected override void ConnectHandler(MauiPicker platformView)
 		{
-			platformView.FocusChange += OnFocusChange;
 			platformView.Click += OnClick;
 
 			base.ConnectHandler(platformView);
 		}
 
 		protected override void DisconnectHandler(MauiPicker platformView)
 		{
-			platformView.FocusChange -= OnFocusChange;
 			platformView.Click -= OnClick;
 
 			base.DisconnectHandler(platformView);
@@ -86,25 +84,29 @@ public static void MapVerticalTextAlignment(IPickerHandler handler, IPicker pick
 			handler.PlatformView?.UpdateVerticalAlignment(picker.VerticalTextAlignment);
 		}
 
-		void OnFocusChange(object? sender, global::Android.Views.View.FocusChangeEventArgs e)
+		internal static void MapFocus(IPickerHandler handler, IPicker picker, object? args)
 		{
-			if (PlatformView == null)
-				return;
-
-			if (e.HasFocus)
+			if (handler.IsConnected())
 			{
-				if (PlatformView.Clickable)
-					PlatformView.CallOnClick();
-				else
-					OnClick(PlatformView, EventArgs.Empty);
+				ViewHandler.MapFocus(handler, picker, args);
+				handler.PlatformView.CallOnClick();
 			}
-			else if (_dialog != null)
+		}
+
+		internal static void MapUnfocus(IPickerHandler handler, IPicker picker, object? args)
+		{
+			if (handler.IsConnected() && handler is PickerHandler pickerHandler)
 			{
-				_dialog.Hide();
-				_dialog = null;
+				pickerHandler.DismissDialog();
+				ViewHandler.MapUnfocus(handler,picker,args);
 			}
 		}
 
+		void DismissDialog()
+		{
+			_dialog?.Dismiss();
+		}
+
 		void OnClick(object? sender, EventArgs e)
 		{
 			if (_dialog == null && VirtualView != null)
@@ -152,15 +154,37 @@ void OnClick(object? sender, EventArgs e)
 
 				_dialog.SetCanceledOnTouchOutside(true);
 
-				_dialog.DismissEvent += (sender, args) =>
-				{
-					_dialog = null;
-				};
+				_dialog.ShowEvent += OnDialogShown;
+
+				_dialog.DismissEvent += OnDialogDismiss;
 
 				_dialog.Show();
 			}
 		}
 
+		void OnDialogDismiss(object? sender, EventArgs e)
+		{
+			if (_dialog is null)
+			{
+				return;
+			}
+
+			_dialog.DismissEvent -= OnDialogDismiss;
+			VirtualView.IsFocused = false;
+			_dialog = null;
+		}
+
+		void OnDialogShown(object? sender, EventArgs e)
+		{
+			if (_dialog is null)
+			{
+				return;
+			}
+
+			_dialog.ShowEvent -= OnDialogShown;
+			VirtualView.IsFocused = true;
+		}
+
 		static void Reload(IPickerHandler handler)
 		{
 			handler.PlatformView.UpdatePicker(handler.VirtualView);

src/Core/src/Handlers/Picker/PickerHandler.cs

@@ -32,6 +32,10 @@ public partial class PickerHandler : IPickerHandler
 
 		public static CommandMapper<IPicker, IPickerHandler> CommandMapper = new(ViewCommandMapper)
 		{
+#if ANDROID
+			[nameof(IPicker.Focus)] = MapFocus,
+			[nameof(IPicker.Unfocus)] = MapUnfocus
+#endif
 		};
 
 		public PickerHandler() : base(Mapper, CommandMapper)

src/Core/src/Platform/Android/MauiDatePicker.cs

@@ -2,6 +2,7 @@
 using Android.Content;
 using Android.Runtime;
 using Android.Text;
+using Android.Text.Method;
 using Android.Util;
 using Android.Views;
 using AndroidX.AppCompat.Widget;
@@ -31,6 +32,10 @@ protected MauiDatePicker(IntPtr javaReference, JniHandleOwnership transfer) : ba
 		{
 		}
 
+		// MovementMethod handles cursor positioning, scrolling, and text selection (per Android docs).
+		// Since text is readonly, we disable it to avoid unnecessary cursor navigation during keyboard input.
+		protected override IMovementMethod? DefaultMovementMethod => null;
+
 		public Action? ShowPicker { get; set; }
 		public Action? HidePicker { get; set; }
 
@@ -44,10 +49,7 @@ void Initialize()
 			if (Background != null)
 				DrawableCompat.Wrap(Background);
 
-			Focusable = true;
-			FocusableInTouchMode = false;
-			Clickable = true;
-			InputType = InputTypes.Null;
+			PickerManager.Init(this);
 
 			SetOnClickListener(this);
 		}

src/Core/src/Platform/Android/MauiPicker.cs

@@ -1,5 +1,6 @@
 using Android.Content;
 using Android.Runtime;
+using Android.Text.Method;
 using Android.Views;
 using AndroidX.AppCompat.Widget;
 using AndroidX.Core.Graphics.Drawable;
@@ -9,25 +10,12 @@ namespace Microsoft.Maui.Platform
 {
 	public class MauiPicker : MauiPickerBase
 	{
-		public bool ShowPopupOnFocus { get; set; }
 
 		public MauiPicker(Context context) : base(context)
 		{
 			PickerManager.Init(this);
 		}
 
-		public override bool OnTouchEvent(MotionEvent? e)
-		{
-			PickerManager.OnTouchEvent(this, e);
-			return base.OnTouchEvent(e); // Raises the OnClick event if focus is already received
-		}
-
-		protected override void OnFocusChanged(bool gainFocus, [GeneratedEnum] FocusSearchDirection direction, ARect? previouslyFocusedRect)
-		{
-			base.OnFocusChanged(gainFocus, direction, previouslyFocusedRect);
-			PickerManager.OnFocusChanged(gainFocus, this);
-		}
-
 		protected override void Dispose(bool disposing)
 		{
 			if (disposing)
@@ -44,5 +32,9 @@ public MauiPickerBase(Context context) : base(context)
 			if (Background != null)
 				DrawableCompat.Wrap(Background);
 		}
+
+		// MovementMethod handles cursor positioning, scrolling, and text selection (per Android docs).
+		// Since text is readonly, we disable it to avoid unnecessary cursor navigation during keyboard input.
+		protected override IMovementMethod? DefaultMovementMethod => null;
 	}
 }

src/Core/src/Platform/Android/MauiTimePicker.cs

@@ -2,6 +2,7 @@
 using Android.Content;
 using Android.Runtime;
 using Android.Text;
+using Android.Text.Method;
 using Android.Util;
 using Android.Views;
 using AndroidX.AppCompat.Widget;
@@ -31,6 +32,10 @@ protected MauiTimePicker(IntPtr javaReference, JniHandleOwnership transfer) : ba
 		{
 		}
 
+		// MovementMethod handles cursor positioning, scrolling, and text selection (per Android docs).
+		// Since text is readonly, we disable it to avoid unnecessary cursor navigation during keyboard input.
+		protected override IMovementMethod? DefaultMovementMethod => null;
+
 		public Action? ShowPicker { get; set; }
 		public Action? HidePicker { get; set; }
 
@@ -44,10 +49,7 @@ void Initialize()
 			if (Background != null)
 				DrawableCompat.Wrap(Background);
 
-			Focusable = true;
-			FocusableInTouchMode = false;
-			Clickable = true;
-			InputType = InputTypes.Null;
+			PickerManager.Init(this);
 
 			SetOnClickListener(this);
 		}

src/Core/src/Platform/Android/PickerManager.cs

@@ -11,60 +11,20 @@ namespace Microsoft.Maui.Platform
 {
 	internal static class PickerManager
 	{
-		readonly static HashSet<Keycode> AvailableKeys = new HashSet<Keycode>(new[] {
-			Keycode.Tab, Keycode.Forward, Keycode.DpadDown, Keycode.DpadLeft, Keycode.DpadRight, Keycode.DpadUp
-		});
-
 		public static void Init(EditText editText)
 		{
 			editText.Focusable = true;
-			editText.Clickable = true;
-			editText.InputType = InputTypes.Null;
-
-			editText.KeyPress += OnKeyPress;
-		}
-
-		public static void OnTouchEvent(EditText sender, MotionEvent? e)
-		{
-			if (e != null && e.Action == MotionEventActions.Up && !sender.IsFocused)
-			{
-				sender.RequestFocus();
-			}
-		}
-
-		public static void OnFocusChanged(bool gainFocus, EditText sender)
-		{
-			if (gainFocus)
-				sender.CallOnClick();
-		}
+    		editText.FocusableInTouchMode = false;
+    		editText.Clickable = true;
 
-		static void OnKeyPress(object? sender, AView.KeyEventArgs e)
-		{
-			//To prevent user from entering text when focus is received
-			e.Handled = true;
-			if (!AvailableKeys.Contains(e.KeyCode))
-			{
-				return;
-			}
-			(sender as AView)?.CallOnClick();
+    		// InputType needs to be set before setting KeyListener
+    		editText.InputType = InputTypes.Null;
+    		editText.KeyListener = null;
 		}
 
 		public static void Dispose(EditText editText)
 		{
-			editText.KeyPress -= OnKeyPress;
 			editText.SetOnClickListener(null);
 		}
-
-		public static Java.Lang.ICharSequence GetTitle(Color titleColor, string title)
-		{
-			if (titleColor == null)
-				return new Java.Lang.String(title);
-
-			var spannableTitle = new SpannableString(title ?? string.Empty);
-#pragma warning disable CA1416 // https://github.com/xamarin/xamarin-android/issues/6962
-			spannableTitle.SetSpan(new ForegroundColorSpan(titleColor.ToPlatform()), 0, spannableTitle.Length(), SpanTypes.ExclusiveExclusive);
-#pragma warning restore CA1416
-			return spannableTitle;
-		}
 	}
 }

src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt

@@ -1 +1,8 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.Platform.MauiPicker.ShowPopupOnFocus.get -> bool
+*REMOVED*Microsoft.Maui.Platform.MauiPicker.ShowPopupOnFocus.set -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnFocusChanged(bool gainFocus, Android.Views.FocusSearchDirection direction, Android.Graphics.Rect? previouslyFocusedRect) -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnTouchEvent(Android.Views.MotionEvent? e) -> bool
+override Microsoft.Maui.Platform.MauiDatePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
+override Microsoft.Maui.Platform.MauiPickerBase.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
+override Microsoft.Maui.Platform.MauiTimePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?