[Android] Fix for Softkeyboard Return key of an Entry control shows Done when the property ReturnType is set to Next

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

@@ -12,15 +12,25 @@ public Issue21109(TestDevice device) : base(device) { }
 
 		public override string Issue => "[Android] MAUI 8.0.3 -> 8.0.6 regression: custom handler with key listener no longer works";
 
-		[Test]
+		[Test,Order(1)]
 		[Category(UITestCategories.Entry)]
-		public void EntryReturnTypeWorks()
+		public void VerifyInitialEntryReturnTypeChange()
+		{
+			App.WaitForElement("WaitForStubControl");
+			//On InitialLoading returnType should work.
+			App.Tap("SearchEntry");
+			VerifyScreenshot();
+		}
+
+		[Test,Order(2)]
+		[Category(UITestCategories.Entry)]
+		public void VerifyDynamicEntryReturnTypeChange()
 		{
 			App.WaitForElement("WaitForStubControl");
 
 			// Verify that ReturnType works as expected.
 			if (App.IsKeyboardShown())
-				App.DismissKeyboard();
+			 	App.DismissKeyboard();
 
 			var returnType1 = App.FindElement("ReturnTypeResult").GetText();
 			App.Tap("ReturnTypeEntry");

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

@@ -42,6 +42,7 @@ public override void SetVirtualView(IView view)
 		// TODO: NET8 issoto - Change the return type to MauiAppCompatEditText
 		protected override void ConnectHandler(AppCompatEditText platformView)
 		{
+			platformView.ViewAttachedToWindow += OnViewAttachedToWindow;
 			platformView.TextChanged += OnTextChanged;
 			platformView.FocusChange += OnFocusedChange;
 			platformView.Touch += OnTouch;
@@ -52,6 +53,7 @@ protected override void ConnectHandler(AppCompatEditText platformView)
 		protected override void DisconnectHandler(AppCompatEditText platformView)
 		{
 			_clearButtonDrawable = null;
+			platformView.ViewAttachedToWindow -= OnViewAttachedToWindow;
 			platformView.TextChanged -= OnTextChanged;
 			platformView.FocusChange -= OnFocusedChange;
 			platformView.Touch -= OnTouch;
@@ -64,6 +66,14 @@ protected override void DisconnectHandler(AppCompatEditText platformView)
 			_set = false;
 		}
 
+		void OnViewAttachedToWindow(object? sender, ViewAttachedToWindowEventArgs e)
+		{
+			if (PlatformView is null || VirtualView is null)
+				return;
+
+			PlatformView.UpdateReturnType(VirtualView);
+		}
+
 		public static void MapBackground(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateBackground(entry);
 

src/Core/src/Platform/Android/EditTextExtensions.cs

@@ -201,7 +201,6 @@ public static void UpdateClearButtonVisibility(this EditText editText, IEntry en
 
 		public static void UpdateReturnType(this EditText editText, IEntry entry)
 		{
-			editText.SetInputType(entry);
 			editText.ImeOptions = entry.ReturnType.ToPlatform();
 
 			// Restart the input on the current focused EditText