- fix insetting on MaterialToolBar so its content doesn't go into the display cutout

Author: PureWeen

src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png

@@ -0,0 +1,24 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28986, "Test SafeArea Flyout Page for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 8)]
+public partial class Issue28986_FlyoutPage : FlyoutPage
+{
+	public Issue28986_FlyoutPage() : base()
+    {
+        var page = new Issue28986_ContentPage() { Title = "SafeArea Flyout Test" };
+        page.ToolbarItems.Add(new ToolbarItem { Text = "Item 1" });
+        Shell.SetBackgroundColor(page, Colors.Blue);
+        Detail = new NavigationPage(page);
+        Flyout = new ContentPage()
+        {
+            Title = "Flyout",
+            Content = new StackLayout
+            {
+                Children =
+                {
+                    new Label { Text = "This is the flyout content" }
+                }
+            }
+        };
+    }
+}

src/Controls/tests/TestCases.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_Shell.png

@@ -1,5 +1,3 @@
-using System.Drawing;
-
 namespace Maui.Controls.Sample.Issues;
 
 [Issue(IssueTracker.Github, 28986, "Test SafeArea Shell Page for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 6)]
@@ -8,7 +6,32 @@ public partial class Issue28986_Shell : Shell
 	public Issue28986_Shell() : base()
     {
         var page = new Issue28986_ContentPage();
+        page.ToolbarItems.Add(new ToolbarItem { Text = "Item 1" });
+        page.Title = "SafeArea Shell Test";
         Shell.SetBackgroundColor(page, Colors.Blue);
-        CurrentItem = page;
+        Items.Add(new FlyoutItem()
+        {
+            Items =
+            {
+                new ShellContent()
+                {
+                    Content = page,
+                }
+            }
+        });
+
+        Items.Add(new FlyoutItem()
+        {
+            Items =
+            {
+                new ShellContent()
+                {
+                    Content = new ContentPage()
+                    {
+                        Title = "Page 2"
+                    },
+                }
+            }
+        });
     }
 }

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

@@ -0,0 +1,27 @@
+#if IOS || ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue28986_FlyoutPage : _IssuesUITest
+{
+    public override string Issue => "Test SafeArea Flyout Page for per-edge safe area control";
+
+    public Issue28986_FlyoutPage(TestDevice device) : base(device)
+    {
+    }
+
+    [Test]
+	[Category(UITestCategories.SafeAreaEdges)]
+	public void ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage()
+	{
+		// 1. Test loads - verify essential elements are present
+		App.WaitForElement("ContentGrid");
+		App.SetOrientationLandscape();
+		App.WaitForElement("ContentGrid");
+		VerifyScreenshot();
+	}
+}
+#endif

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

@@ -30,11 +30,39 @@ protected override MaterialToolbar CreatePlatformElement()
 			return Microsoft.Maui.PlatformInterop.CreateToolbar(context, context.GetActionBarHeight(), -1);
 		}
 
+		protected override void ConnectHandler(MaterialToolbar platformView)
+		{
+			base.ConnectHandler(platformView);
+			platformView.ViewAttachedToWindow += OnViewAttachedToWindow;
+			platformView.ViewDetachedFromWindow += OnViewDetachedFromWindow;
+		}
+
+
+		void OnViewDetachedFromWindow(object? sender, View.ViewDetachedFromWindowEventArgs e)
+		{
+			if (sender is MaterialToolbar mt && mt.IsAlive() && mt.Context is not null)
+			{
+				GlobalWindowInsetListenerExtensions.RemoveGlobalWindowInsetListener(mt, mt.Context);
+			}
+		}
+		
+		void OnViewAttachedToWindow(object? sender, View.ViewAttachedToWindowEventArgs e)
+		{
+			var context = MauiContext?.Context ?? throw new InvalidOperationException("Context cannot be null");
+            GlobalWindowInsetListenerExtensions.TrySetGlobalWindowInsetListener(PlatformView, context);
+        }
+
 		private protected override void OnDisconnectHandler(object platformView)
 		{
 			base.OnDisconnectHandler(platformView);
+
 			if (platformView is MaterialToolbar mt && mt.IsAlive())
+			{
 				mt.RemoveFromParent();
+				mt.ViewAttachedToWindow -= OnViewAttachedToWindow;
+				mt.ViewDetachedFromWindow -= OnViewDetachedFromWindow;
+
+			};
 		}
 
 		public static void MapTitle(IToolbarHandler arg1, IToolbar arg2)

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

@@ -55,6 +55,12 @@ public GlobalWindowInsetListener() : base(DispatchModeStop)
             var rightInset = Math.Max(systemBars?.Right ?? 0, displayCutout?.Right ?? 0);
             var bottomInset = Math.Max(systemBars?.Bottom ?? 0, displayCutout?.Bottom ?? 0);
 
+            if (v is MaterialToolbar)
+            {
+                v.SetPadding(leftInset, 0, rightInset, 0);
+                return WindowInsetsCompat.Consumed;
+            }
+
             // Handle special cases
             var appBarLayout = v.FindViewById<AppBarLayout>(Resource.Id.navigationlayout_appbar);
 
@@ -305,7 +311,7 @@ internal static class GlobalWindowInsetListenerExtensions
     /// <param name="context">The Android context to get the listener from</param>
     public static bool TrySetGlobalWindowInsetListener(this View view, Context context)
     {
-        if (view.FindParent(
+        if (view is not MaterialToolbar && view.FindParent(
             (parent) =>
                 parent is NestedScrollView ||
                 parent is AppBarLayout ||

src/Core/src/Handlers/Toolbar/ToolbarHandler.Android.cs

@@ -24,6 +24,7 @@ Microsoft.Maui.Handlers.OpenWindowRequest.OpenWindowRequest(Microsoft.Maui.Handl
 Microsoft.Maui.Hosting.MauiAppBuilder.Environment.get -> Microsoft.Maui.Hosting.MauiHostEnvironment!
 Microsoft.Maui.Hosting.MauiAppBuilder.Properties.get -> System.Collections.Generic.IDictionary<object!, object!>!
 Microsoft.Maui.PlatformViewGroup
+override Microsoft.Maui.Handlers.ToolbarHandler.ConnectHandler(Google.Android.Material.AppBar.MaterialToolbar! platformView) -> void
 override Microsoft.Maui.PlatformViewGroup.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
 override Microsoft.Maui.PlatformViewGroup.ThresholdClass.get -> nint
 override Microsoft.Maui.PlatformViewGroup.ThresholdType.get -> System.Type!