Address copilot suggestion

HarishwaranVijayakumar · HarishwaranVijayakumar · commit b076f33057ee · 2026-01-28T13:25:18.000+05:30
diff --git a/src/Controls/src/Core/Entry/Entry.Android.cs b/src/Controls/src/Core/Entry/Entry.Android.cs
@@ -32,6 +32,17 @@ public static void MapText(IEntryHandler handler, Entry entry)
 
 		// TODO: Material3: Make it public in .NET 11
 		// MaterialEntryHandler-specific overloads
+		internal static void MapImeOptions(EntryHandler2 handler, Entry entry)
+		{
+			if (handler.PlatformView?.EditText is null)
+			{
+				return;
+			}
+
+			Platform.EditTextExtensions.UpdateImeOptions(handler.PlatformView.EditText, entry);
+		}
+
+		// TODO: Material3: Make it public in .NET 11
 		internal static void MapText(EntryHandler2 handler, Entry entry)
 		{
 			if (handler.PlatformView?.EditText is null)
diff --git a/src/Controls/src/Core/Entry/Entry.Mapper.cs b/src/Controls/src/Core/Entry/Entry.Mapper.cs
@@ -24,8 +24,11 @@ public partial class Entry
 #if ANDROID
 			if (RuntimeFeature.IsMaterial3Enabled)
 			{
+				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(PlatformConfiguration.AndroidSpecific.Entry.ImeOptionsProperty.PropertyName, MapImeOptions);
 				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(Text), MapText);
 				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(TextTransform), MapText);
+				EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
+				EntryHandler2.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);
 			}
 #endif
 
diff --git a/src/Core/src/Handlers/Entry/EntryHandler2.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler2.Android.cs
@@ -230,7 +230,8 @@ static void MapFocus(EntryHandler2 handler, IEntry entry, object? args)
 	{
 		if (args is FocusRequest request)
 		{
-			handler.PlatformView.Focus(request);
+			// Focus the EditText directly, not the TextInputLayout container
+			handler.PlatformView.EditText?.Focus(request);
 		}
 	}
 
@@ -275,7 +276,7 @@ void OnEditorAction(object? sender, EditorActionEventArgs e)
 		{
 			var actionId = e.ActionId;
 			var evt = e.Event;
-			ImeAction currentInputImeFlag = PlatformView.EditText!.ImeOptions;
+			ImeAction currentInputImeFlag = PlatformView.EditText?.ImeOptions ?? ImeAction.None;
 
 			// On API 34 it looks like they fixed the issue where the actionId is ImeAction.ImeNull when using a keyboard
 			// so I'm just setting the actionId here to the current ImeOptions so the logic can all be simplified
@@ -297,7 +298,7 @@ void OnEditorAction(object? sender, EditorActionEventArgs e)
 			else if (evt?.KeyCode is null && (actionId == ImeAction.Done || actionId == currentInputImeFlag))
 			{
 				VirtualView?.Completed();
-				// In case of Search, Go, Send the EditorAction will be invoked for KeyEventActions which will cause Completed to inovke twice
+				// In case of Search, Go, Send the EditorAction will be invoked for KeyEventActions which will cause Completed to invoke twice
 				//So for these setting handled to true
 				if (actionId == ImeAction.Search ||
 				 actionId == ImeAction.Go ||

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,11 @@ public partial class Entry`
`24`	`24`	`#if ANDROID`
`25`	`25`	`if (RuntimeFeature.IsMaterial3Enabled)`
`26`	`26`	`{`
	`27`	`+ EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(PlatformConfiguration.AndroidSpecific.Entry.ImeOptionsProperty.PropertyName, MapImeOptions);`
`27`	`28`	`EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(Text), MapText);`
`28`	`29`	`EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(TextTransform), MapText);`
	`30`	`+ EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);`
	`31`	`+ EntryHandler2.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);`
`29`	`32`	`}`
`30`	`33`	`#endif`
`31`	`34`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,8 @@ static void MapFocus(EntryHandler2 handler, IEntry entry, object? args)`
`230`	`230`	`{`
`231`	`231`	`if (args is FocusRequest request)`
`232`	`232`	`{`
`233`		`- handler.PlatformView.Focus(request);`
	`233`	`+ // Focus the EditText directly, not the TextInputLayout container`
	`234`	`+ handler.PlatformView.EditText?.Focus(request);`
`234`	`235`	`}`
`235`	`236`	`}`
`236`	`237`
`@@ -275,7 +276,7 @@ void OnEditorAction(object? sender, EditorActionEventArgs e)`
`275`	`276`	`{`
`276`	`277`	`var actionId = e.ActionId;`
`277`	`278`	`var evt = e.Event;`
`278`		`- ImeAction currentInputImeFlag = PlatformView.EditText!.ImeOptions;`
	`279`	`+ ImeAction currentInputImeFlag = PlatformView.EditText?.ImeOptions ?? ImeAction.None;`
`279`	`280`
`280`	`281`	`// On API 34 it looks like they fixed the issue where the actionId is ImeAction.ImeNull when using a keyboard`
`281`	`282`	`// so I'm just setting the actionId here to the current ImeOptions so the logic can all be simplified`
`@@ -297,7 +298,7 @@ void OnEditorAction(object? sender, EditorActionEventArgs e)`
`297`	`298`	`else if (evt?.KeyCode is null && (actionId == ImeAction.Done \|\| actionId == currentInputImeFlag))`
`298`	`299`	`{`
`299`	`300`	`VirtualView?.Completed();`
`300`		`- // In case of Search, Go, Send the EditorAction will be invoked for KeyEventActions which will cause Completed to inovke twice`
	`301`	`+ // In case of Search, Go, Send the EditorAction will be invoked for KeyEventActions which will cause Completed to invoke twice`
`301`	`302`	`//So for these setting handled to true`
`302`	`303`	`if (actionId == ImeAction.Search \|\|`
`303`	`304`	`actionId == ImeAction.Go \|\|`