Revert "Hide Keyboard in Android Entry and Editor when back key is pr…

…essed (#4827)" (#5019)

This reverts commit 3551378.

src/Compatibility/Core/src/Android/Renderers/EntryRenderer.cs

@@ -368,7 +368,6 @@ void UpdateInputType()
 
 		abstract protected void UpdatePlaceholderColor();
 
-		[PortHandler]
 		void OnKeyboardBackPressed(object sender, EventArgs eventArgs)
 		{
 			Control?.ClearFocus();

src/Compatibility/Core/src/Android/Renderers/FormsEditText.cs

@@ -15,7 +15,7 @@ public FormsEditText(Context context) : base(context)
 		{
 		}
 
-		[PortHandler]
+
 		public override bool OnKeyPreIme(Keycode keyCode, KeyEvent e)
 		{
 			if (keyCode != Keycode.Back || e.Action != KeyEventActions.Down)

src/Core/src/Platform/Android/KeyboardManager.cs → src/Controls/src/Core/Platform/Android/KeyboardManager.cs

@@ -1,17 +1,16 @@
-#nullable disable
 using System;
+using Android.App;
 using Android.Content;
 using Android.OS;
 using Android.Views.InputMethods;
 using Android.Widget;
-using Microsoft.Maui.Essentials;
 using AView = Android.Views.View;
 
-namespace Microsoft.Maui.Platform
+namespace Microsoft.Maui.Controls.Platform
 {
-	public static class KeyboardManager
+	internal static class KeyboardManager
 	{
-		public static void HideKeyboard(this AView inputView, bool overrideValidation = false)
+		internal static void HideKeyboard(this AView inputView, bool overrideValidation = false)
 		{
 			if (inputView == null)
 				throw new ArgumentNullException(nameof(inputView) + " must be set before the keyboard can be hidden.");
@@ -27,7 +26,7 @@ public static void HideKeyboard(this AView inputView, bool overrideValidation =
 			}
 		}
 
-		public static void ShowKeyboard(this TextView inputView)
+		internal static void ShowKeyboard(this TextView inputView)
 		{
 			if (inputView == null)
 				throw new ArgumentNullException(nameof(inputView) + " must be set before the keyboard can be shown.");
@@ -41,7 +40,7 @@ public static void ShowKeyboard(this TextView inputView)
 			}
 		}
 
-		public static void ShowKeyboard(this SearchView searchView)
+		internal static void ShowKeyboard(this SearchView searchView)
 		{
 			if (searchView == null)
 			{
@@ -74,7 +73,7 @@ public static void ShowKeyboard(this SearchView searchView)
 			}
 		}
 
-		public static void ShowKeyboard(this AView view)
+		internal static void ShowKeyboard(this AView view)
 		{
 			switch (view)
 			{
@@ -101,7 +100,7 @@ void ShowKeyboard()
 				view.ShowKeyboard();
 			};
 
-			MainThread.BeginInvokeOnMainThread(ShowKeyboard);
+			Device.BeginInvokeOnMainThread(ShowKeyboard);
 		}
 	}
 }

src/Core/src/Handlers/Editor/EditorHandler.Android.cs

@@ -12,7 +12,7 @@ public partial class EditorHandler : ViewHandler<IEditor, AppCompatEditText>
 
 		protected override AppCompatEditText CreatePlatformView()
 		{
-			var editText = new MauiEditText(Context)
+			var editText = new AppCompatEditText(Context)
 			{
 				ImeOptions = ImeAction.Done,
 				Gravity = GravityFlags.Top,

src/Core/src/Handlers/Entry/EntryHandler.Android.cs

@@ -1,5 +1,4 @@
-using System;
-using Android.Content.Res;
+using Android.Content.Res;
 using Android.Graphics.Drawables;
 using Android.Runtime;
 using Android.Text;
@@ -20,7 +19,7 @@ public partial class EntryHandler : ViewHandler<IEntry, AppCompatEditText>
 
 		protected override AppCompatEditText CreatePlatformView()
 		{
-			var nativeEntry = new MauiEditText(Context);
+			var nativeEntry = new AppCompatEditText(Context);
 			_defaultPlaceholderColors = nativeEntry.HintTextColors;
 			return nativeEntry;
 		}
@@ -35,11 +34,6 @@ protected override void ConnectHandler(AppCompatEditText platformView)
 			platformView.FocusChange += OnFocusedChange;
 			platformView.Touch += OnTouch;
 			platformView.EditorAction += OnEditorAction;
-
-			if (platformView is IMauiEditText mauiEditText)
-			{
-				mauiEditText.OnKeyboardBackPressed += OnKeyboardBackPressed;
-			}
 		}
 
 		protected override void DisconnectHandler(AppCompatEditText platformView)
@@ -49,11 +43,6 @@ protected override void DisconnectHandler(AppCompatEditText platformView)
 			platformView.FocusChange -= OnFocusedChange;
 			platformView.Touch -= OnTouch;
 			platformView.EditorAction -= OnEditorAction;
-
-			if (platformView is IMauiEditText mauiEditText)
-			{
-				mauiEditText.OnKeyboardBackPressed -= OnKeyboardBackPressed;
-			}
 		}
 
 		public static void MapBackground(IEntryHandler handler, IEntry entry) =>
@@ -143,10 +132,5 @@ void OnEditorAction(object? sender, EditorActionEventArgs e)
 
 			e.Handled = true;
 		}
-
-		void OnKeyboardBackPressed(object? sender, EventArgs eventArgs)
-		{
-			PlatformView?.ClearFocus();
-		}
 	}
 }