From 823663e55e1630de609f0ca36fdc2bd0d57c29c7 Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Thu, 16 May 2024 15:11:31 +0200
Subject: [PATCH 01/11] Fix flyout behaviour switching exception

---
 .../src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs
index 63ef0303a7e5..ec53134f3562 100644
--- a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs
+++ b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs
@@ -277,6 +277,9 @@ void UpdateFlyoutBehavior()
 			var behavior = VirtualView.FlyoutBehavior;
 			if (_detailViewFragment?.DetailView?.Handler?.PlatformView == null)
 				return;
+			
+			// Important to create the layout views before setting the lock mode
+			LayoutViews();
 
 			switch (behavior)
 			{
@@ -289,8 +292,6 @@ void UpdateFlyoutBehavior()
 					DrawerLayout.SetDrawerLockMode(VirtualView.IsGestureEnabled ? DrawerLayout.LockModeUnlocked : DrawerLayout.LockModeLockedClosed);
 					break;
 			}
-
-			LayoutViews();
 		}
 
 		protected override void ConnectHandler(View platformView)

From 75e9fd27e611385a196dc2b102f5ea18ccca663f Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Sat, 18 May 2024 22:37:24 +0200
Subject: [PATCH 02/11] Tests added

---
 .../Tests/Issues/Issue20858.cs                | 21 +++++++++++++++++++
 .../TestCases/Issues/Issue20858And18161.xaml  | 19 +++++++++++++++++
 .../Issues/Issue20858And18161.xaml.cs         | 17 +++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
 create mode 100644 src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml
 create mode 100644 src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
new file mode 100644
index 000000000000..27358709fcfa
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
@@ -0,0 +1,21 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue20858 : _IssuesUITest
+{
+	public Issue20858(TestDevice device) : base(device)
+	{ }
+
+	public override string Issue => "FlyoutPage Android app crashing on orientation change";
+
+	[Test]
+	public void NoExceptionShouldBeThrown()
+	{
+		App.SetOrientationLandscape();
+
+		//The test passes if no exception is thrown
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml b/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml
new file mode 100644
index 000000000000..9b0ed94f5c35
--- /dev/null
+++ b/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<FlyoutPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+            x:Class="Maui.Controls.Sample.Issues.Issue20858And18161">
+  <FlyoutPage.Flyout>
+    <ContentPage Title="The FlyOut">
+      <Label Text="This is the flyout" />
+    </ContentPage>
+  </FlyoutPage.Flyout>
+  <FlyoutPage.Detail>
+    <NavigationPage>
+      <x:Arguments>
+        <ContentPage Title="The Detail">
+          <Label Text="This is the detail" />
+        </ContentPage>
+      </x:Arguments>
+    </NavigationPage>
+  </FlyoutPage.Detail>
+</FlyoutPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs
new file mode 100644
index 000000000000..b389b3a79166
--- /dev/null
+++ b/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs
@@ -0,0 +1,17 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 20858, "FlyoutPage Android app crashing on orientation change", PlatformAffected.Android)]
+	//[Issue(IssueTracker.Github, 18161, "Toggling FlyoutLayoutBehavior on Android causes the app to crash", PlatformAffected.Android)]
+	public partial class Issue20858And18161 : FlyoutPage
+	{
+		public Issue20858And18161()
+		{
+			InitializeComponent();
+			IsPresented = true;
+		}
+	}
+}
\ No newline at end of file

From 8d590db499fc4ccdf7858aa41a39684d89839735 Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Sun, 19 May 2024 18:09:29 +0200
Subject: [PATCH 03/11] Flyout test page added

---
 .../Tests/Issues/Issue20858.cs                |  9 +++++++--
 ...20858And18161.xaml => FlyoutPageTest.xaml} |  7 +++++--
 .../TestCases/Issues/FlyoutPageTest.xaml.cs   | 20 +++++++++++++++++++
 .../Issues/Issue20858And18161.xaml.cs         | 17 ----------------
 4 files changed, 32 insertions(+), 21 deletions(-)
 rename src/Controls/tests/TestCases/Issues/{Issue20858And18161.xaml => FlyoutPageTest.xaml} (66%)
 create mode 100644 src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
 delete mode 100644 src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
index 27358709fcfa..de2e03bb3ef4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
@@ -6,14 +6,19 @@ namespace Microsoft.Maui.TestCases.Tests.Issues;
 
 public class Issue20858 : _IssuesUITest
 {
-	public Issue20858(TestDevice device) : base(device)
+	public Issue20858(TestDevice device) 
+		: base(device)
 	{ }
 
-	public override string Issue => "FlyoutPage Android app crashing on orientation change";
+	public override string Issue => "FlyoutPage Android app crashing on orientation change when flyout is open";
 
 	[Test]
+	[Category(UITestCategories.FlyoutPage)]]
 	public void NoExceptionShouldBeThrown()
 	{
+		App.SetOrientationPortrait();
+		App.WaitForElement("ToggleFlyout");
+		App.Tap("ToggleFlyout");
 		App.SetOrientationLandscape();
 
 		//The test passes if no exception is thrown
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
similarity index 66%
rename from src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml
rename to src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
index 9b0ed94f5c35..8d024f4b4ce7 100644
--- a/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml
+++ b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <FlyoutPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-            x:Class="Maui.Controls.Sample.Issues.Issue20858And18161">
+            x:Class="Maui.Controls.Sample.Issues.FlyoutPageTest">
   <FlyoutPage.Flyout>
     <ContentPage Title="The FlyOut">
       <Label Text="This is the flyout" />
@@ -11,7 +11,10 @@
     <NavigationPage>
       <x:Arguments>
         <ContentPage Title="The Detail">
-          <Label Text="This is the detail" />
+          <StackLayout>
+            <Label Text="This is the detail" />
+            <Button Text="Toggle the Flyout" AutomationId="ToggleFlyout" Clicked="ToggleFlyout_Clicked" />
+          </StackLayout>
         </ContentPage>
       </x:Arguments>
     </NavigationPage>
diff --git a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
new file mode 100644
index 000000000000..c311f5ba0d5a
--- /dev/null
+++ b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.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.None, 0, "FlyoutPage test", PlatformAffected.All)]
+	public partial class FlyoutPageTest : FlyoutPage
+	{
+		public FlyoutPageTest()
+		{
+			InitializeComponent();
+		}
+
+		public async void ToggleFlyout_Clicked(object sender, EventArgs e)
+		{
+			IsPresented = !IsPresented;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs
deleted file mode 100644
index b389b3a79166..000000000000
--- a/src/Controls/tests/TestCases/Issues/Issue20858And18161.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Xaml;
-
-namespace Maui.Controls.Sample.Issues
-{
-	[XamlCompilation(XamlCompilationOptions.Compile)]
-	[Issue(IssueTracker.Github, 20858, "FlyoutPage Android app crashing on orientation change", PlatformAffected.Android)]
-	//[Issue(IssueTracker.Github, 18161, "Toggling FlyoutLayoutBehavior on Android causes the app to crash", PlatformAffected.Android)]
-	public partial class Issue20858And18161 : FlyoutPage
-	{
-		public Issue20858And18161()
-		{
-			InitializeComponent();
-			IsPresented = true;
-		}
-	}
-}
\ No newline at end of file

From 1c2b745ddd6d4a5cf9385fed081eebf52bf90595 Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Mon, 20 May 2024 00:10:50 +0200
Subject: [PATCH 04/11] Flyoutpage test fixes

---
 src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
index c311f5ba0d5a..05f5022b16dd 100644
--- a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
+++ b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
@@ -1,4 +1,5 @@
-using Microsoft.Maui.Controls;
+using System;
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
 
 namespace Maui.Controls.Sample.Issues
@@ -12,7 +13,7 @@ public FlyoutPageTest()
 			InitializeComponent();
 		}
 
-		public async void ToggleFlyout_Clicked(object sender, EventArgs e)
+		public void ToggleFlyout_Clicked(object sender, EventArgs e)
 		{
 			IsPresented = !IsPresented;
 		}

From 7e5b16b8ff7d96ab164d91057a7e79393074f64b Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Mon, 20 May 2024 00:24:00 +0200
Subject: [PATCH 05/11] Flyout toggle test added

---
 .../Tests/Issues/Issue18161.cs                | 24 +++++++++++++++++++
 .../Tests/Issues/Issue20858.cs                |  4 ++--
 .../TestCases/Issues/FlyoutPageTest.xaml      |  3 ++-
 .../TestCases/Issues/FlyoutPageTest.xaml.cs   | 20 ++++++++++++++--
 4 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
new file mode 100644
index 000000000000..3104332a245c
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue18161 : _IssuesUITest
+{
+	public Issue18161(TestDevice device) 
+		: base(device)
+	{ }
+
+	public override string Issue => "Toggling FlyoutLayoutBehavior on Android causes the app to crash";
+
+	[Test]
+	[Category(UITestCategories.FlyoutPage)]]
+	public void NoExceptionShouldBeThrown()
+	{
+		App.WaitForElement("ToggleBehaviour");
+		App.Tap("ToggleBehaviour");
+
+		//The test passes if no exception is thrown
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
index de2e03bb3ef4..c799cd6447ac 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
@@ -17,8 +17,8 @@ public Issue20858(TestDevice device)
 	public void NoExceptionShouldBeThrown()
 	{
 		App.SetOrientationPortrait();
-		App.WaitForElement("ToggleFlyout");
-		App.Tap("ToggleFlyout");
+		App.WaitForElement("OpenFlyout");
+		App.Tap("OpenFlyout");
 		App.SetOrientationLandscape();
 
 		//The test passes if no exception is thrown
diff --git a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
index 8d024f4b4ce7..9c35c304a911 100644
--- a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
+++ b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
@@ -13,7 +13,8 @@
         <ContentPage Title="The Detail">
           <StackLayout>
             <Label Text="This is the detail" />
-            <Button Text="Toggle the Flyout" AutomationId="ToggleFlyout" Clicked="ToggleFlyout_Clicked" />
+            <Button Text="Open the Flyout to begin testing" AutomationId="OpenFlyout" Clicked="OpenFlyout_Clicked" />
+            <Button Text="Change Flyout behaviour" AutomationId="ToggleBehaviour" Clicked="ToggleBehaviour_Clicked" />
           </StackLayout>
         </ContentPage>
       </x:Arguments>
diff --git a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
index 05f5022b16dd..18a7ccc43e5a 100644
--- a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
+++ b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Devices;
 
 namespace Maui.Controls.Sample.Issues
 {
@@ -13,9 +14,24 @@ public FlyoutPageTest()
 			InitializeComponent();
 		}
 
-		public void ToggleFlyout_Clicked(object sender, EventArgs e)
+		public async void OpenFlyout_Clicked(object sender, EventArgs e)
 		{
-			IsPresented = !IsPresented;
+			if (DeviceDisplay.Current.MainDisplayInfo.Orientation != DisplayOrientation.Portrait)
+			{
+				await DisplayAlert("Alert", "Please rotate the device to portrait mode to test", "OK");
+				return;
+			}
+
+			IsPresented = true;
+
+			await DisplayAlert("Alert", "Flyout is open. Please rotate device to landscape", "OK");
+		}
+
+		public void ToggleBehaviour_Clicked(object sender, EventArgs e)
+		{
+			FlyoutLayoutBehavior = FlyoutLayoutBehavior == FlyoutLayoutBehavior.Split 
+				? FlyoutLayoutBehavior.Popover 
+				: FlyoutLayoutBehavior.Split;
 		}
 	}
 }
\ No newline at end of file

From c4fe537d2ae92e1deda870c5873bbd7b0c2ec4e3 Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Tue, 21 May 2024 19:39:41 +0200
Subject: [PATCH 06/11] Remove duplicate ] characters

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs     | 2 +-
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
index 3104332a245c..8b448d0d76c6 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
@@ -13,7 +13,7 @@ public Issue18161(TestDevice device)
 	public override string Issue => "Toggling FlyoutLayoutBehavior on Android causes the app to crash";
 
 	[Test]
-	[Category(UITestCategories.FlyoutPage)]]
+	[Category(UITestCategories.FlyoutPage)]
 	public void NoExceptionShouldBeThrown()
 	{
 		App.WaitForElement("ToggleBehaviour");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
index c799cd6447ac..38bf2e883d08 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
@@ -13,7 +13,7 @@ public Issue20858(TestDevice device)
 	public override string Issue => "FlyoutPage Android app crashing on orientation change when flyout is open";
 
 	[Test]
-	[Category(UITestCategories.FlyoutPage)]]
+	[Category(UITestCategories.FlyoutPage)]
 	public void NoExceptionShouldBeThrown()
 	{
 		App.SetOrientationPortrait();

From 819b4cfa9bd610469d3edc1a624725c3e800f6db Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Tue, 11 Jun 2024 14:06:08 +0200
Subject: [PATCH 07/11] Flyout test pages added

---
 .../TestCases/Issues/FlyoutPageTest.xaml.cs   | 37 -------------------
 .../{FlyoutPageTest.xaml => Issue18161.xaml}  |  5 +--
 .../tests/TestCases/Issues/Issue18161.xaml.cs | 23 ++++++++++++
 .../tests/TestCases/Issues/Issue20858.xaml    | 22 +++++++++++
 .../tests/TestCases/Issues/Issue20858.xaml.cs | 21 +++++++++++
 5 files changed, 68 insertions(+), 40 deletions(-)
 delete mode 100644 src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
 rename src/Controls/tests/TestCases/Issues/{FlyoutPageTest.xaml => Issue18161.xaml} (74%)
 create mode 100644 src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
 create mode 100644 src/Controls/tests/TestCases/Issues/Issue20858.xaml
 create mode 100644 src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs

diff --git a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs b/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
deleted file mode 100644
index 18a7ccc43e5a..000000000000
--- a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Xaml;
-using Microsoft.Maui.Devices;
-
-namespace Maui.Controls.Sample.Issues
-{
-	[XamlCompilation(XamlCompilationOptions.Compile)]
-	[Issue(IssueTracker.None, 0, "FlyoutPage test", PlatformAffected.All)]
-	public partial class FlyoutPageTest : FlyoutPage
-	{
-		public FlyoutPageTest()
-		{
-			InitializeComponent();
-		}
-
-		public async void OpenFlyout_Clicked(object sender, EventArgs e)
-		{
-			if (DeviceDisplay.Current.MainDisplayInfo.Orientation != DisplayOrientation.Portrait)
-			{
-				await DisplayAlert("Alert", "Please rotate the device to portrait mode to test", "OK");
-				return;
-			}
-
-			IsPresented = true;
-
-			await DisplayAlert("Alert", "Flyout is open. Please rotate device to landscape", "OK");
-		}
-
-		public void ToggleBehaviour_Clicked(object sender, EventArgs e)
-		{
-			FlyoutLayoutBehavior = FlyoutLayoutBehavior == FlyoutLayoutBehavior.Split 
-				? FlyoutLayoutBehavior.Popover 
-				: FlyoutLayoutBehavior.Split;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml b/src/Controls/tests/TestCases/Issues/Issue18161.xaml
similarity index 74%
rename from src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
rename to src/Controls/tests/TestCases/Issues/Issue18161.xaml
index 9c35c304a911..e35cde455c84 100644
--- a/src/Controls/tests/TestCases/Issues/FlyoutPageTest.xaml
+++ b/src/Controls/tests/TestCases/Issues/Issue18161.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <FlyoutPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-            x:Class="Maui.Controls.Sample.Issues.FlyoutPageTest">
+            x:Class="Maui.Controls.Sample.Issues.Issue18161">
   <FlyoutPage.Flyout>
     <ContentPage Title="The FlyOut">
       <Label Text="This is the flyout" />
@@ -12,8 +12,7 @@
       <x:Arguments>
         <ContentPage Title="The Detail">
           <StackLayout>
-            <Label Text="This is the detail" />
-            <Button Text="Open the Flyout to begin testing" AutomationId="OpenFlyout" Clicked="OpenFlyout_Clicked" />
+            <Label Text="The detail page." />
             <Button Text="Change Flyout behaviour" AutomationId="ToggleBehaviour" Clicked="ToggleBehaviour_Clicked" />
           </StackLayout>
         </ContentPage>
diff --git a/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
new file mode 100644
index 000000000000..efb7115d4fb3
--- /dev/null
+++ b/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
@@ -0,0 +1,23 @@
+using System;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 18161, "Toggling FlyoutLayoutBehavior on Android causes the app to crash", PlatformAffected.Android)]
+	public partial class Issue18161 : FlyoutPage
+	{
+		public Issue18161()
+		{
+			InitializeComponent();
+		}
+
+		public void ToggleBehaviour_Clicked(object sender, EventArgs e)
+		{
+			FlyoutLayoutBehavior = FlyoutLayoutBehavior == FlyoutLayoutBehavior.Split 
+				? FlyoutLayoutBehavior.Popover 
+				: FlyoutLayoutBehavior.Split;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858.xaml b/src/Controls/tests/TestCases/Issues/Issue20858.xaml
new file mode 100644
index 000000000000..5311c89858db
--- /dev/null
+++ b/src/Controls/tests/TestCases/Issues/Issue20858.xaml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<FlyoutPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+            x:Class="Maui.Controls.Sample.Issues.Issue20858">
+  <FlyoutPage.Flyout>
+    <ContentPage Title="The FlyOut">
+      <Label Text="This is the flyout" />
+    </ContentPage>
+  </FlyoutPage.Flyout>
+  <FlyoutPage.Detail>
+    <NavigationPage>
+      <x:Arguments>
+        <ContentPage Title="The Detail">
+          <StackLayout>
+            <Label Text="Please rotate the device to portrait mode to test. Open the flyout and then rotate device to landscape." />
+            <Button Text="Open the Flyout to begin testing" AutomationId="OpenFlyout" Clicked="OpenFlyout_Clicked" />
+          </StackLayout>
+        </ContentPage>
+      </x:Arguments>
+    </NavigationPage>
+  </FlyoutPage.Detail>
+</FlyoutPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
new file mode 100644
index 000000000000..cd720876217f
--- /dev/null
+++ b/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 20858, "FlyoutPage open when rotating test", PlatformAffected.Android)]
+	public partial class Issue20858 : FlyoutPage
+	{
+		public Issue20858()
+		{
+			InitializeComponent();
+		}
+
+		public void OpenFlyout_Clicked(object sender, EventArgs e)
+		{
+			IsPresented = true;
+		}
+	}
+}
\ No newline at end of file

From fcdcf5ce0c1b5f446b44f138b83d60aec0384218 Mon Sep 17 00:00:00 2001
From: Thomas Muller <thomasmuller@me.com>
Date: Tue, 11 Jun 2024 21:04:21 +0200
Subject: [PATCH 08/11] Check for platforms

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
index 38bf2e883d08..acb1c771f4ba 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20858.cs
@@ -1,3 +1,4 @@
+#if ANDROID || IOS
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
@@ -23,4 +24,5 @@ public void NoExceptionShouldBeThrown()
 
 		//The test passes if no exception is thrown
 	}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

From 0e81ec129b5d7df5fb89703de10bb35054896b3c Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 18 Jun 2024 21:04:53 +0200
Subject: [PATCH 09/11] Fix title

---
 src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
index cd720876217f..c9da7c00ef50 100644
--- a/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
+++ b/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
@@ -5,7 +5,7 @@
 namespace Maui.Controls.Sample.Issues
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
-	[Issue(IssueTracker.Github, 20858, "FlyoutPage open when rotating test", PlatformAffected.Android)]
+	[Issue(IssueTracker.Github, 20858, "FlyoutPage Android app crashing on orientation change when flyout is open", PlatformAffected.Android)]
 	public partial class Issue20858 : FlyoutPage
 	{
 		public Issue20858()

From 9bdd4c38dee68d87dbad5b2009280529261fc986 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 21 Jun 2024 13:21:19 -0500
Subject: [PATCH 10/11] - fix tests

---
 .../TestCases.Shared.Tests/Tests/Issues/Issue18161.cs    | 1 +
 src/Controls/tests/TestCases/Issues/Issue18161.xaml      | 6 ++++--
 src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs   | 9 ++++++++-
 src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs   | 5 ++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
index 8b448d0d76c6..2cbbf8d769da 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18161.cs
@@ -18,6 +18,7 @@ public void NoExceptionShouldBeThrown()
 	{
 		App.WaitForElement("ToggleBehaviour");
 		App.Tap("ToggleBehaviour");
+		App.Tap("ToggleBehaviour");
 
 		//The test passes if no exception is thrown
 	}
diff --git a/src/Controls/tests/TestCases/Issues/Issue18161.xaml b/src/Controls/tests/TestCases/Issues/Issue18161.xaml
index e35cde455c84..762c497588c3 100644
--- a/src/Controls/tests/TestCases/Issues/Issue18161.xaml
+++ b/src/Controls/tests/TestCases/Issues/Issue18161.xaml
@@ -4,7 +4,10 @@
             x:Class="Maui.Controls.Sample.Issues.Issue18161">
   <FlyoutPage.Flyout>
     <ContentPage Title="The FlyOut">
-      <Label Text="This is the flyout" />
+      <StackLayout>
+          <Label Text="This is the flyout" />
+          <Button Text="Change Flyout behaviour" AutomationId="ToggleBehaviour" Clicked="ToggleBehaviour_Clicked" />
+        </StackLayout>
     </ContentPage>
   </FlyoutPage.Flyout>
   <FlyoutPage.Detail>
@@ -13,7 +16,6 @@
         <ContentPage Title="The Detail">
           <StackLayout>
             <Label Text="The detail page." />
-            <Button Text="Change Flyout behaviour" AutomationId="ToggleBehaviour" Clicked="ToggleBehaviour_Clicked" />
           </StackLayout>
         </ContentPage>
       </x:Arguments>
diff --git a/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
index efb7115d4fb3..2176782e8e3c 100644
--- a/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
+++ b/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
@@ -1,16 +1,19 @@
 using System;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Devices;
 
 namespace Maui.Controls.Sample.Issues
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 	[Issue(IssueTracker.Github, 18161, "Toggling FlyoutLayoutBehavior on Android causes the app to crash", PlatformAffected.Android)]
-	public partial class Issue18161 : FlyoutPage
+	public partial class Issue18161 : FlyoutPage, IFlyoutPageController, IFlyoutView
 	{
 		public Issue18161()
 		{
 			InitializeComponent();
+			this.IsPresented = true;
 		}
 
 		public void ToggleBehaviour_Clicked(object sender, EventArgs e)
@@ -19,5 +22,9 @@ public void ToggleBehaviour_Clicked(object sender, EventArgs e)
 				? FlyoutLayoutBehavior.Popover 
 				: FlyoutLayoutBehavior.Split;
 		}
+
+		bool IFlyoutPageController.ShouldShowSplitMode => FlyoutLayoutBehavior == FlyoutLayoutBehavior.Split;
+
+		double IFlyoutView.FlyoutWidth => 100;
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
index c9da7c00ef50..d46909f398a0 100644
--- a/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
+++ b/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
@@ -1,12 +1,13 @@
 using System;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Devices;
 
 namespace Maui.Controls.Sample.Issues
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 	[Issue(IssueTracker.Github, 20858, "FlyoutPage Android app crashing on orientation change when flyout is open", PlatformAffected.Android)]
-	public partial class Issue20858 : FlyoutPage
+	public partial class Issue20858 : FlyoutPage, IFlyoutPageController
 	{
 		public Issue20858()
 		{
@@ -17,5 +18,7 @@ public void OpenFlyout_Clicked(object sender, EventArgs e)
 		{
 			IsPresented = true;
 		}
+
+		bool IFlyoutPageController.ShouldShowSplitMode => FlyoutLayoutBehavior == FlyoutLayoutBehavior.Split;
 	}
 }
\ No newline at end of file

From 2725fe555f39c734e3c40a6321eb3e6dbe3b4bbf Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 24 Jun 2024 17:40:47 -0500
Subject: [PATCH 11/11] - fix for WinUI

---
 src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
index 2176782e8e3c..ccec85dbb176 100644
--- a/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
+++ b/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
@@ -13,6 +14,13 @@ public partial class Issue18161 : FlyoutPage, IFlyoutPageController, IFlyoutView
 		public Issue18161()
 		{
 			InitializeComponent();
+			this.Loaded += Issue18161_Loaded;
+		}
+
+		async void Issue18161_Loaded(object sender, EventArgs e)
+		{
+			// https://github.com/dotnet/maui/issues/13496
+			await Task.Yield();
 			this.IsPresented = true;
 		}