Fix ImageButton not rendering correctly based on its bounds

src/Controls/tests/TestCases.HostApp/Issues/Issue25558.cs

@@ -0,0 +1,23 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25558, "ImageButton does not scale Image correctly", PlatformAffected.Android)]
+public class Issue25558 : ContentPage
+{
+	public Issue25558()
+	{
+		var verticalStackLayout = new VerticalStackLayout
+		{
+			Padding = 10
+		};
+
+		var imageButton = new ImageButton
+		{
+			AutomationId = "imageButton",
+			Source = "groceries.png",
+			BackgroundColor = Colors.Blue
+		};
+
+		verticalStackLayout.Add(imageButton);
+		Content = verticalStackLayout;
+	}
+}

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

@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue25558 : _IssuesUITest
+{
+	public override string Issue => "ImageButton does not scale Image correctly";
+
+	public Issue25558(TestDevice device) : base(device)
+	{
+	}
+
+	[Test]
+	[Category(UITestCategories.ImageButton)]
+	public void Issue25558VerifyImageButtonAspects()
+	{
+		App.WaitForElement("imageButton");
+		VerifyScreenshot();
+	}
+}

src/Core/src/Handlers/ImageButton/ImageButtonHandler.Android.cs

@@ -14,6 +14,7 @@ protected override ShapeableImageView CreatePlatformView()
 			// These set the defaults so visually it matches up with other platforms
 			platformView.SetPadding(0, 0, 0, 0);
 			platformView.SoundEffectsEnabled = false;
+			platformView.SetAdjustViewBounds(true);
 
 			return platformView;
 		}

src/Core/src/Platform/Android/ImageViewExtensions.cs

@@ -18,13 +18,13 @@ public static void Clear(this ImageView imageView)
 
 		public static void UpdateAspect(this ImageView imageView, IImage image)
 		{
-			// Apply bounds adjustment only for the Image control, not for the ImageButton control. ShapeableImageView serves as the platform view for ImageButton
-			if (imageView is not ShapeableImageView)
+			if (image.Aspect == Aspect.AspectFill)
 			{
-				if (image.Aspect == Aspect.AspectFill)
-					imageView.SetAdjustViewBounds(false);
-				else
-					imageView.SetAdjustViewBounds(true);
+				imageView.SetAdjustViewBounds(false);
+			}
+			else
+			{
+				imageView.SetAdjustViewBounds(true);
 			}
 
 			imageView.SetScaleType(image.Aspect.ToScaleType());