[Android] Entry & Picker VerticalTextAlignment ignored

src/Controls/samples/Controls.Sample.UITests/Issues/Issue21717.xaml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue21717"
+             Title="Issue21717">
+
+    <Grid RowDefinitions="200,200">
+        <Entry
+            HorizontalOptions="Fill"
+            VerticalOptions="Fill"
+            HorizontalTextAlignment="Center"
+            VerticalTextAlignment="Center"
+            Text="Horizontally and vertically centered text inside an entry"
+            BackgroundColor="Aqua"/>
+
+        <Picker
+            Grid.Row="1"
+            HorizontalOptions="Fill"
+            VerticalOptions="Fill"
+            x:Name="picker"
+            AutomationId="picker"
+            HorizontalTextAlignment="Center"
+            VerticalTextAlignment="Center"
+            SelectedIndex="0"
+            BackgroundColor="Aqua">
+            <Picker.ItemsSource>
+                <x:Array Type="{x:Type x:String}">
+                    <x:String>Horizontally and vertically centered text inside a picker</x:String>
+                </x:Array>
+            </Picker.ItemsSource>
+        </Picker>
+    </Grid>
+</ContentPage>

src/Controls/samples/Controls.Sample.UITests/Issues/Issue21717.xaml.cs

@@ -0,0 +1,20 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 21717, "[Android] Entry & Picker VerticalTextAlignment ignored", PlatformAffected.Android)]
+
+public partial class Issue21717 : ContentPage
+{
+	public Issue21717()
+	{
+		InitializeComponent();
+	}
+
+	protected override void OnAppearing()
+	{
+		base.OnAppearing();
+		picker.SelectedIndex = 0;
+	}
+}

src/Controls/tests/UITests/Tests/Issues/Issue21717.cs

@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues
+{
+	public class Issue21717 : _IssuesUITest
+	{
+		public override string Issue => "[Android] Entry & Picker VerticalTextAlignment ignored";
+
+		public Issue21717(TestDevice device) : base(device) { }
+
+		[Test]
+		public async Task VerticalTextAlignmentShouldWork()
+		{
+			this.IgnoreIfPlatforms(new[] { TestDevice.Mac, TestDevice.iOS, TestDevice.Windows });
+
+			_ = App.WaitForElement("picker");
+
+			await Task.Delay(500);
+
+			VerifyScreenshot();
+		}
+	}
+}

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

@@ -45,6 +45,7 @@ protected override void ConnectHandler(AppCompatEditText platformView)
 			platformView.ViewAttachedToWindow += OnViewAttachedToWindow;
 			platformView.TextChanged += OnTextChanged;
 			platformView.FocusChange += OnFocusedChange;
+			platformView.LayoutChange += PlatformViewLayoutChange;
 			platformView.Touch += OnTouch;
 			platformView.EditorAction += OnEditorAction;
 		}
@@ -57,6 +58,7 @@ protected override void DisconnectHandler(AppCompatEditText platformView)
 			platformView.ViewAttachedToWindow -= OnViewAttachedToWindow;
 			platformView.TextChanged -= OnTextChanged;
 			platformView.FocusChange -= OnFocusedChange;
+			platformView.LayoutChange -= PlatformViewLayoutChange;
 			platformView.Touch -= OnTouch;
 			platformView.EditorAction -= OnEditorAction;
 
@@ -274,5 +276,14 @@ internal void HideClearButton()
 			PlatformView.SetCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
 			_clearButtonVisible = false;
 		}
+
+		void PlatformViewLayoutChange(object? sender, LayoutChangeEventArgs e)
+		{
+			if (PlatformView != null && VirtualView != null)
+			{
+				PlatformView.SetHeight(PlatformView.Height);
+				PlatformView.UpdateVerticalTextAlignment(VirtualView);
+			}
+		}
 	}
 }

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

@@ -21,6 +21,7 @@ protected override void ConnectHandler(MauiPicker platformView)
 		{
 			platformView.FocusChange += OnFocusChange;
 			platformView.Click += OnClick;
+			platformView.LayoutChange += PlatformViewLayoutChange;
 
 			base.ConnectHandler(platformView);
 		}
@@ -29,6 +30,7 @@ protected override void DisconnectHandler(MauiPicker platformView)
 		{
 			platformView.FocusChange -= OnFocusChange;
 			platformView.Click -= OnClick;
+			platformView.LayoutChange -= PlatformViewLayoutChange;
 
 			base.DisconnectHandler(platformView);
 		}
@@ -165,5 +167,14 @@ static void Reload(IPickerHandler handler)
 		{
 			handler.PlatformView.UpdatePicker(handler.VirtualView);
 		}
+
+		void PlatformViewLayoutChange(object? sender, Android.Views.View.LayoutChangeEventArgs e)
+		{
+			if (PlatformView != null && VirtualView != null)
+			{
+				PlatformView.SetHeight(PlatformView.Height);
+				PlatformView.UpdateVerticalTextAlignment(VirtualView);
+			}
+		}
 	}
 }