From 31e94a0a02a99d3c4b587d6d3373c17ae1648fac Mon Sep 17 00:00:00 2001
From: Oliver Brown <galaxiaguy@gmail.com>
Date: Thu, 13 Oct 2022 19:35:44 +0100
Subject: [PATCH 01/10] Add sample for frame opacity.

---
 .../Pages/Compatibility/FramePage.xaml                | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
index c671d3c19803..5870fd2debde 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
@@ -52,6 +52,17 @@
                 <Label 
                     Text="Has Shadow" />
             </Frame>
+            <Label
+                Text="Opacity"
+                Style="{StaticResource Headline}"/>
+            <Frame
+                BackgroundColor="LightGray"
+                BorderColor="Red"
+                Opacity="0.2"
+                HasShadow="True">
+                <Label 
+                    Text="Opacity 0.5" />
+            </Frame>
             <Label
                 Text="IsClippedToBounds (False)"
                 Style="{StaticResource Headline}"/>

From 5269d958419dc95dc68302a2aa2e0c54a5383139 Mon Sep 17 00:00:00 2001
From: Oliver Brown <galaxiaguy@gmail.com>
Date: Thu, 13 Oct 2022 19:35:56 +0100
Subject: [PATCH 02/10] Add sample for BoxView opacity.

---
 .../Controls.Sample/Pages/Controls/BoxViewPage.xaml   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/BoxViewPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/BoxViewPage.xaml
index 6abaf60e3cce..78e04e6f7668 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/BoxViewPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/BoxViewPage.xaml
@@ -67,6 +67,17 @@
                 VerticalOptions="Center"
                 HorizontalOptions="Center" />
 
+            <Label
+                Text="Using Opacity"
+                Style="{StaticResource Headline}"/>
+            <BoxView
+                Color="Orange"
+                Opacity="0.5"
+                WidthRequest="160"
+                HeightRequest="160"
+                VerticalOptions="Center"
+                HorizontalOptions="Center" />
+
         </VerticalStackLayout>
     </ScrollView>
 </views:BasePage>
\ No newline at end of file

From 87cb155becb66cccac78bddfec97598b1555f999 Mon Sep 17 00:00:00 2001
From: Oliver Brown <galaxiaguy@gmail.com>
Date: Thu, 13 Oct 2022 19:36:15 +0100
Subject: [PATCH 03/10] Add mapper entry for Opacity on Frame.

---
 .../src/Core/Compatibility/Handlers/Android/FrameRenderer.cs   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index ee1e37e817de..c49c5639dd31 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -28,7 +28,8 @@ public static IPropertyMapper<Frame, FrameRenderer> Mapper
 				[Frame.CornerRadiusProperty.PropertyName] = (h, _) => h.UpdateCornerRadius(),
 				[Frame.BorderColorProperty.PropertyName] = (h, _) => h.UpdateBorderColor(),
 				[Microsoft.Maui.Controls.Compatibility.Layout.IsClippedToBoundsProperty.PropertyName] = (h, _) => h.UpdateClippedToBounds(),
-				[Frame.ContentProperty.PropertyName] = (h, _) => h.UpdateContent()
+				[Frame.ContentProperty.PropertyName] = (h, _) => h.UpdateContent(),
+				[VisualElement.OpacityProperty.PropertyName] = (h, v) => h.UpdateOpacity(v)
 			};
 
 		public static CommandMapper<Frame, FrameRenderer> CommandMapper

From f11af154837a394562e21545d4674e16c8c0d63a Mon Sep 17 00:00:00 2001
From: Oliver Brown <galaxiaguy@gmail.com>
Date: Thu, 13 Oct 2022 20:02:01 +0100
Subject: [PATCH 04/10] Fix Opacity on Frame sample.

---
 .../samples/Controls.Sample/Pages/Compatibility/FramePage.xaml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
index 5870fd2debde..def96c14cb80 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
@@ -58,7 +58,7 @@
             <Frame
                 BackgroundColor="LightGray"
                 BorderColor="Red"
-                Opacity="0.2"
+                Opacity="0.5"
                 HasShadow="True">
                 <Label 
                     Text="Opacity 0.5" />

From b5c75e5ce49e3b194e181aa980e78e56819abd7c Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 17 Oct 2022 19:05:25 -0500
Subject: [PATCH 05/10] - move initialize to mapper

---
 .../Compatibility/Handlers/Android/FrameRenderer.cs |  3 +--
 src/Core/src/Handlers/View/ViewHandler.cs           | 13 ++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index c49c5639dd31..ee1e37e817de 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -28,8 +28,7 @@ public static IPropertyMapper<Frame, FrameRenderer> Mapper
 				[Frame.CornerRadiusProperty.PropertyName] = (h, _) => h.UpdateCornerRadius(),
 				[Frame.BorderColorProperty.PropertyName] = (h, _) => h.UpdateBorderColor(),
 				[Microsoft.Maui.Controls.Compatibility.Layout.IsClippedToBoundsProperty.PropertyName] = (h, _) => h.UpdateClippedToBounds(),
-				[Frame.ContentProperty.PropertyName] = (h, _) => h.UpdateContent(),
-				[VisualElement.OpacityProperty.PropertyName] = (h, v) => h.UpdateOpacity(v)
+				[Frame.ContentProperty.PropertyName] = (h, _) => h.UpdateContent()
 			};
 
 		public static CommandMapper<Frame, FrameRenderer> CommandMapper
diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
index 046f89640dbd..d8990fb96c12 100644
--- a/src/Core/src/Handlers/View/ViewHandler.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -58,7 +58,10 @@ public abstract partial class ViewHandler : ElementHandler, IViewHandler
 #if WINDOWS || MACCATALYST
 				[nameof(IContextFlyoutElement.ContextFlyout)] = MapContextFlyout,
 #endif
-			};
+#if ANDROID
+				["Initialize"] = (h, v) => ((PlatformView?)h.PlatformView)?.Initialize(v)
+#endif
+	};
 
 		public static CommandMapper<IView, IViewHandler> ViewCommandMapper = new()
 		{
@@ -128,10 +131,10 @@ public override void SetVirtualView(IElement element)
 		{
 			base.SetVirtualView(element);
 
-			if (element is IView view)
-			{
-				((PlatformView?)PlatformView)?.Initialize(view);
-			}
+			//if (element is IView view)
+			//{
+			//	((PlatformView?)PlatformView)?.Initialize(view);
+			//}
 		}
 #endif
 

From 72971db25a3029d6a7efb524d47d30cb8f16b364 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 21 Oct 2022 18:41:10 -0500
Subject: [PATCH 06/10] - Frame tests

---
 .../DeviceTests/Elements/Frame/FrameTests.cs  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
index 2e09103dbec8..625d65f01513 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Handlers.Compatibility;
+using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Hosting;
@@ -10,6 +11,30 @@
 
 namespace Microsoft.Maui.DeviceTests
 {
+	public class FrameStub : Frame, IStubBase
+	{
+		public double MaximumWidth { get; set; }
+		public double MaximumHeight { get; set; }
+		public double MinimumWidth { get; set; }
+		public double MinimumHeight { get; set; }
+		public Visibility Visibility { get; set; }
+		public Semantics Semantics { get; set; }
+		double IStubBase.Width { get; set; }
+		double IStubBase.Height { get; set; }
+		Paint IStubBase.Background { get; set; }
+		IShape IStubBase.Clip { get; set; }
+		IElement IStubBase.Parent { get; set; }
+	}
+
+	[Category(TestCategory.Frame)]
+	public class FrameHandlerTest : HandlerTestBase<FrameRenderer, FrameStub>
+	{
+		public FrameHandlerTest()
+		{
+
+		}
+	}
+
 	[Category(TestCategory.Frame)]
 	public partial class FrameTests : ControlsHandlerTestBase
 	{

From 9e9741e9698577e9f87e752cb5690a496f51a640 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 31 Oct 2022 09:50:33 -0500
Subject: [PATCH 07/10] - frame parts

---
 .../MainPage.xaml.cs                          |   2 +-
 .../Controls.Sample.Sandbox/MainPage.xaml     |   2 +-
 .../Controls.Sample.Sandbox/MainPage.xaml.cs  |  13 +++
 .../Controls.Sample.Sandbox/MauiProgram.cs    |   3 +-
 .../Handlers/Android/FrameRenderer.cs         |  56 +++++++++-
 .../Handlers/VisualElementRenderer.cs         |  10 +-
 .../DeviceTests/Elements/Frame/FrameTests.cs  | 102 +++++++++++++++---
 src/Core/src/Handlers/View/ViewHandler.cs     |   6 +-
 .../Handlers/View/ViewHandlerOfT.Android.cs   |  47 ++------
 .../Handlers/ViewHandlerExtensions.Android.cs |  45 ++++++++
 10 files changed, 226 insertions(+), 60 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.Profiling/MainPage.xaml.cs b/src/Controls/samples/Controls.Sample.Profiling/MainPage.xaml.cs
index 0730eb243841..3f02e8742b9e 100644
--- a/src/Controls/samples/Controls.Sample.Profiling/MainPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.Profiling/MainPage.xaml.cs
@@ -13,7 +13,7 @@ public MainPage()
 		}
 
 		private void OnCounterClicked(object sender, EventArgs e)
-		{
+		{			
 			count++;
 			CounterLabel.Text = $"Current count: {count}";
 		}
diff --git a/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml b/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml
index d4b53136c417..bd5d6503254b 100644
--- a/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml
+++ b/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml
@@ -3,5 +3,5 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Maui.Controls.Sample.MainPage"
     xmlns:local="clr-namespace:Maui.Controls.Sample">
-
+    <Frame BackgroundColor="Purple" WidthRequest="400" HeightRequest="400"></Frame>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml.cs b/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml.cs
index effdbcdb46d7..7208f4d943d9 100644
--- a/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml.cs
@@ -14,5 +14,18 @@ public MainPage()
 		{
 			InitializeComponent();
 		}
+
+		protected override void OnAppearing()
+		{
+			base.OnAppearing();
+
+		}
+
+		protected override void OnNavigatedTo(NavigatedToEventArgs args)
+		{
+			base.OnNavigatedTo(args);
+
+			var activity = Window?.Handler?.PlatformView;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.Sandbox/MauiProgram.cs b/src/Controls/samples/Controls.Sample.Sandbox/MauiProgram.cs
index 7f0b23daab73..ed18bd03025e 100644
--- a/src/Controls/samples/Controls.Sample.Sandbox/MauiProgram.cs
+++ b/src/Controls/samples/Controls.Sample.Sandbox/MauiProgram.cs
@@ -2,6 +2,7 @@
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Hosting;
 using Microsoft.Maui.Hosting;
+using Microsoft.Maui.LifecycleEvents;
 
 namespace Maui.Controls.Sample
 {
@@ -18,6 +19,6 @@ public static MauiApp CreateMauiApp() =>
 	class App : Application
 	{
 		protected override Window CreateWindow(IActivationState activationState) =>
-			new Window(new NavigationPage(new MainPage()));
+			new Window(new MainPage());
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index ee1e37e817de..2e00dd451da5 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -28,7 +28,10 @@ public static IPropertyMapper<Frame, FrameRenderer> Mapper
 				[Frame.CornerRadiusProperty.PropertyName] = (h, _) => h.UpdateCornerRadius(),
 				[Frame.BorderColorProperty.PropertyName] = (h, _) => h.UpdateBorderColor(),
 				[Microsoft.Maui.Controls.Compatibility.Layout.IsClippedToBoundsProperty.PropertyName] = (h, _) => h.UpdateClippedToBounds(),
-				[Frame.ContentProperty.PropertyName] = (h, _) => h.UpdateContent()
+				[Frame.ContentProperty.PropertyName] = (h, _) => h.UpdateContent(),
+				[nameof(IView.AutomationId)] = (h, v) => ViewHandler.MapAutomationId(h, v),
+				[nameof(IView.IsEnabled)] = (h, v) => ViewHandler.MapIsEnabled(h, v),
+				[nameof(IViewHandler.ContainerView)] = MapContainerView,
 			};
 
 		public static CommandMapper<Frame, FrameRenderer> CommandMapper
@@ -317,9 +320,54 @@ void UpdateContent()
 		}
 
 		#region IPlatformViewHandler
-		bool IViewHandler.HasContainer { get => false; set { } }
 
-		object? IViewHandler.ContainerView => null;
+		bool NeedsContainer
+		{
+			get
+			{
+				var virtualView = Element as IView;
+				return virtualView?.Clip != null || virtualView?.Shadow != null
+					|| (virtualView as IBorder)?.Border != null || virtualView?.InputTransparent == true;
+			}
+		}
+
+		static void MapContainerView(IViewHandler handler, IView view)
+		{
+			if (handler is FrameRenderer frameRenderer)
+			{
+				handler.HasContainer = frameRenderer.NeedsContainer;
+			}
+		}
+
+		bool _hasContainer;
+		AView? _containerView;
+		bool IViewHandler.HasContainer
+		{
+			get => _hasContainer;
+			set
+			{
+				if (_hasContainer == value)
+					return;
+
+				_hasContainer = value;
+
+				if (value)
+				{
+					this.SetupContainerFromHandler((handler) =>
+					{
+						var view = new WrapperView(handler!.MauiContext!.Context);
+						_containerView = view;
+						return view;
+					});
+				}
+				else
+				{
+					this.RemoveContainerFromHandler(_ => _containerView = null);
+				}
+			}
+		}
+
+		object? IViewHandler.ContainerView => _containerView;
 
 		IView? IViewHandler.VirtualView => Element;
 
@@ -331,7 +379,7 @@ void UpdateContent()
 
 		AView IPlatformViewHandler.PlatformView => this;
 
-		AView? IPlatformViewHandler.ContainerView => this;
+		AView? IPlatformViewHandler.ContainerView => _containerView;
 
 		void IViewHandler.PlatformArrange(Graphics.Rect rect) =>
 			this.PlatformArrangeHandler(rect);
diff --git a/src/Controls/src/Core/Compatibility/Handlers/VisualElementRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/VisualElementRenderer.cs
index 789187f086fb..79997a300d86 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/VisualElementRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/VisualElementRenderer.cs
@@ -252,14 +252,18 @@ internal static void SetVirtualView(
 
 			_ = view ?? throw new ArgumentNullException(nameof(view));
 
-			if (oldElement?.Handler != null)
-				oldElement.Handler = null;
-
 			currentVirtualView = (TElement)view;
 
 			if (currentVirtualView.Handler != nativeViewHandler)
 				currentVirtualView.Handler = nativeViewHandler;
 
+			// We set the previous virtual view to null after setting it on the incoming virtual view.
+			// This makes it easier for the incoming virtual view to have influence
+			// on how the exchange of handlers happens.
+			// We will just set the handler to null ourselves as a last resort cleanup
+			if (oldElement?.Handler != null)
+				oldElement.Handler = null;
+
 			_mapper = _defaultMapper;
 
 			if (currentVirtualView is IPropertyMapperView imv)
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
index 625d65f01513..53446a9a35cb 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Handlers.Compatibility;
+using Microsoft.Maui.Controls.Shapes;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
@@ -13,21 +14,87 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public class FrameStub : Frame, IStubBase
 	{
-		public double MaximumWidth { get; set; }
-		public double MaximumHeight { get; set; }
-		public double MinimumWidth { get; set; }
-		public double MinimumHeight { get; set; }
-		public Visibility Visibility { get; set; }
-		public Semantics Semantics { get; set; }
-		double IStubBase.Width { get; set; }
-		double IStubBase.Height { get; set; }
-		Paint IStubBase.Background { get; set; }
-		IShape IStubBase.Clip { get; set; }
-		IElement IStubBase.Parent { get; set; }
+		public double MaximumWidth
+		{
+			get => base.MaximumWidthRequest;
+			set => base.MaximumWidthRequest = value;
+		}
+
+		public double MaximumHeight
+		{
+			get => base.MaximumHeightRequest;
+			set => base.MaximumHeightRequest = value;
+		}
+
+		public double MinimumWidth
+		{
+			get => base.MinimumWidthRequest;
+			set => base.MinimumWidthRequest = value;
+		}
+
+		public double MinimumHeight
+		{
+			get => base.MinimumHeightRequest;
+			set => base.MinimumHeightRequest = value;
+		}
+
+		public Visibility Visibility
+		{
+			get => base.IsVisible ? Visibility.Visible : Visibility.Hidden;
+			set
+			{
+				if (value == Visibility.Visible)
+					base.IsVisible = true;
+				else
+					base.IsVisible = false;
+			}
+		}
+
+		public Semantics Semantics
+		{
+			get;
+			set;
+		}
+
+		double IStubBase.Width
+		{
+			get => base.WidthRequest;
+			set => base.WidthRequest = value;
+		}
+
+		double IStubBase.Height
+		{
+			get => base.HeightRequest;
+			set => base.HeightRequest = value;
+		}
+
+		Paint IStubBase.Background
+		{
+			get => base.Background;
+			set => base.Background = value;
+		}
+
+		IShape IStubBase.Clip
+		{
+			get;
+			set;
+		}
+
+		IShape IView.Clip
+		{
+			get => (this as IStubBase).Clip;
+		}
+
+
+		IElement IStubBase.Parent
+		{
+			get => (IElement)base.Parent;
+			set => base.Parent = (Element)value;
+		}
 	}
 
 	[Category(TestCategory.Frame)]
-	public class FrameHandlerTest : HandlerTestBase<FrameRenderer, FrameStub>
+	public class FrameHandlerTest : HandlerTestBase<FrameRendererTest, FrameStub>
 	{
 		public FrameHandlerTest()
 		{
@@ -35,6 +102,17 @@ public FrameHandlerTest()
 		}
 	}
 
+	public class FrameRendererTest : FrameRenderer
+	{
+#if ANDROID
+
+		public FrameRendererTest() : base(MauiProgramDefaults.DefaultContext)
+		{
+		}
+
+#endif
+	}
+
 	[Category(TestCategory.Frame)]
 	public partial class FrameTests : ControlsHandlerTestBase
 	{
diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
index d8990fb96c12..a4ade383de43 100644
--- a/src/Core/src/Handlers/View/ViewHandler.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -100,7 +100,11 @@ public bool HasContainer
 
 		protected abstract void RemoveContainer();
 
-		public PlatformView? ContainerView { get; private protected set; }
+		public PlatformView? ContainerView 
+		{ 
+			get; 
+			private protected set; 
+		}
 
 		object? IViewHandler.ContainerView => ContainerView;
 
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs
index 4a607dcce5ab..a3c8d908914d 100644
--- a/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs
+++ b/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs
@@ -17,42 +17,15 @@ public override void PlatformArrange(Rect frame) =>
 		public override Size GetDesiredSize(double widthConstraint, double heightConstraint) =>
 			this.GetDesiredSizeFromHandler(widthConstraint, heightConstraint);
 
-		protected override void SetupContainer()
-		{
-			if (Context == null || PlatformView == null || ContainerView != null)
-				return;
-
-			var oldParent = (ViewGroup?)PlatformView.Parent;
-
-			var oldIndex = oldParent?.IndexOfChild(PlatformView);
-			oldParent?.RemoveView(PlatformView);
-
-			ContainerView ??= new WrapperView(Context);
-			((ViewGroup)ContainerView).AddView(PlatformView);
-
-			if (oldIndex is int idx && idx >= 0)
-				oldParent?.AddView(ContainerView, idx);
-			else
-				oldParent?.AddView(ContainerView);
-		}
-
-		protected override void RemoveContainer()
-		{
-			if (Context == null || PlatformView == null || ContainerView == null || PlatformView.Parent != ContainerView)
-				return;
-
-			var oldParent = (ViewGroup?)ContainerView.Parent;
-
-			var oldIndex = oldParent?.IndexOfChild(ContainerView);
-			oldParent?.RemoveView(ContainerView);
-
-			((ViewGroup)ContainerView).RemoveAllViews();
-			ContainerView = null;
-
-			if (oldIndex is int idx && idx >= 0)
-				oldParent?.AddView(PlatformView, idx);
-			else
-				oldParent?.AddView(PlatformView);
-		}
+		protected override void SetupContainer() =>
+			this.SetupContainerFromHandler((handler) =>
+			{
+				var view = new WrapperView(handler!.MauiContext!.Context);
+				((ViewHandler<TVirtualView, TPlatformView>)handler).ContainerView = view;
+				return view;
+			});
+
+		protected override void RemoveContainer() =>
+			this.RemoveContainerFromHandler((handler) => ((ViewHandler<TVirtualView, TPlatformView>)handler).ContainerView = null);
 	}
 }
diff --git a/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs b/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs
index aae9aad0225c..79208ac994f0 100644
--- a/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs
+++ b/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs
@@ -191,5 +191,50 @@ internal static int MakeMeasureSpecExact(this Context context, double size)
 			var deviceSize = (int)context!.ToPixels(size);
 			return MeasureSpecMode.Exactly.MakeMeasureSpec(deviceSize);
 		}
+		
+		internal static void SetupContainerFromHandler(this IPlatformViewHandler viewHandler, Func<IPlatformViewHandler, View> createContainerView)
+		{
+			var context = viewHandler.MauiContext?.Context;
+			var platformView = viewHandler.PlatformView;
+			var containerView = viewHandler.ContainerView;
+
+			if (context == null || platformView == null || containerView != null)
+				return;
+
+			var oldParent = (ViewGroup?)platformView.Parent;
+			var oldIndex = oldParent?.IndexOfChild(platformView);
+			oldParent?.RemoveView(platformView);
+
+			containerView = viewHandler.ContainerView ?? createContainerView.Invoke(viewHandler);
+			((ViewGroup)containerView).AddView(platformView);
+
+			if (oldIndex is int idx && idx >= 0)
+				oldParent?.AddView(containerView, idx);
+			else
+				oldParent?.AddView(containerView);
+		}
+
+		internal static void RemoveContainerFromHandler(this IPlatformViewHandler viewHandler, Action<IPlatformViewHandler> clearContainerView)
+		{
+			var context = viewHandler.MauiContext?.Context;
+			var platformView = viewHandler.PlatformView;
+			var containerView = viewHandler.ContainerView;
+
+			if (context == null || platformView == null || containerView == null || platformView.Parent != containerView)
+				return;
+
+			var oldParent = (ViewGroup?)containerView.Parent;
+
+			var oldIndex = oldParent?.IndexOfChild(containerView);
+			oldParent?.RemoveView(containerView);
+
+			((ViewGroup)containerView).RemoveAllViews();
+			clearContainerView.Invoke(viewHandler);
+
+			if (oldIndex is int idx && idx >= 0)
+				oldParent?.AddView(platformView, idx);
+			else
+				oldParent?.AddView(platformView);
+		}
 	}
 }

From 9384533a10df2eeffd4490b7068ec0122c6e0cae Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 30 Nov 2022 16:12:33 -0600
Subject: [PATCH 08/10] - fixup android tests

---
 .../Handlers/Android/FrameRenderer.cs         | 27 ++++++++++++++++---
 .../DeviceTests/Elements/Frame/FrameTests.cs  | 26 ++++++++++++++----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index 2e00dd451da5..3dc3f8687f21 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -6,14 +6,17 @@
 using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.Views;
+using Android.Views.Inspectors;
 using AndroidX.CardView.Widget;
 using AndroidX.Core.View;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
+using static Android.Icu.Text.CaseMap;
 using AColor = Android.Graphics.Color;
 using ARect = Android.Graphics.Rect;
 using AView = Android.Views.View;
 using Color = Microsoft.Maui.Graphics.Color;
+using static Microsoft.Maui.Primitives.Dimension;
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
@@ -53,9 +56,19 @@ public static CommandMapper<Frame, FrameRenderer> CommandMapper
 		public event EventHandler<VisualElementChangedEventArgs>? ElementChanged;
 		public event EventHandler<PropertyChangedEventArgs>? ElementPropertyChanged;
 
-		public FrameRenderer(Context context) : base(context)
+		public FrameRenderer(Context context) : this(context, Mapper)
 		{
-			_viewHandlerWrapper = new ViewHandlerDelegator<Frame>(Mapper, CommandMapper, this);
+		}
+
+		// TODO NET8 make public
+		internal FrameRenderer(Context context, IPropertyMapper mapper)
+			: this(context, mapper, CommandMapper)
+		{
+		}
+
+		internal FrameRenderer(Context context, IPropertyMapper mapper, CommandMapper commandMapper) : base(context)
+		{
+			_viewHandlerWrapper = new ViewHandlerDelegator<Frame>(mapper, commandMapper, this);
 		}
 
 		protected CardView Control => this;
@@ -74,8 +87,16 @@ protected Frame? Element
 
 		Size IViewHandler.GetDesiredSize(double widthMeasureSpec, double heightMeasureSpec)
 		{
+			double minWidth = 20;
+			if (IsExplicitSet(widthMeasureSpec) && !double.IsInfinity(widthMeasureSpec))
+				minWidth = widthMeasureSpec;
+
+			double minHeight = 20;
+			if (IsExplicitSet(widthMeasureSpec) && !double.IsInfinity(heightMeasureSpec))
+				minHeight = heightMeasureSpec;
+
 			return VisualElementRenderer<Frame>.GetDesiredSize(this, widthMeasureSpec, heightMeasureSpec,
-				new Size(20, 20));
+				new Size(minWidth, minHeight));
 		}
 
 		protected override void Dispose(bool disposing)
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
index 53446a9a35cb..ad4964c8d4c2 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
@@ -50,11 +50,7 @@ public Visibility Visibility
 			}
 		}
 
-		public Semantics Semantics
-		{
-			get;
-			set;
-		}
+		public Semantics Semantics { get; set; } = new Semantics();
 
 		double IStubBase.Width
 		{
@@ -109,7 +105,27 @@ public class FrameRendererTest : FrameRenderer
 		public FrameRendererTest() : base(MauiProgramDefaults.DefaultContext)
 		{
 		}
+		public FrameRendererTest(IPropertyMapper mapper)
+			: base(MauiProgramDefaults.DefaultContext, mapper)
+		{
+		}
 
+		public FrameRendererTest(IPropertyMapper mapper, CommandMapper commandMapper)
+			: base(MauiProgramDefaults.DefaultContext, mapper, commandMapper)
+		{
+		}
+
+#else
+
+		public FrameRendererTest(IPropertyMapper mapper)
+			: base(mapper)
+		{
+		}
+
+		public FrameRendererTest(IPropertyMapper mapper, CommandMapper commandMapper)
+			: base(mapper, commandMapper)
+		{
+		}
 #endif
 	}
 

From baacad806158053304faeb49f7d808bbabb05784 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 30 Nov 2022 16:18:24 -0600
Subject: [PATCH 09/10] - fix tests

---
 .../Handlers/Windows/FrameRenderer.cs              | 14 +++++++++++++-
 .../Compatibility/Handlers/iOS/FrameRenderer.cs    | 12 ++++++++++++
 .../tests/DeviceTests/Elements/Frame/FrameTests.cs |  5 +++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
index 147b970eca08..d55763e99092 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
@@ -18,7 +18,19 @@ public static IPropertyMapper<Frame, FrameRenderer> Mapper
 		public static CommandMapper<Frame, FrameRenderer> CommandMapper
 			= new CommandMapper<Frame, FrameRenderer>(VisualElementRendererCommandMapper);
 
-		public FrameRenderer() : base(Mapper, CommandMapper)
+		public FrameRenderer() : this(Mapper, CommandMapper)
+		{
+			AutoPackage = false;
+		}      
+		
+		// TODO NET8 make public
+		internal FrameRenderer(IPropertyMapper mapper)
+			: this( mapper, CommandMapper)
+		{
+		}
+
+		// TODO NET8 make public
+		internal FrameRenderer(IPropertyMapper mapper, CommandMapper commandMapper) : base(mapper, commandMapper)
 		{
 			AutoPackage = false;
 		}
diff --git a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
index 5fe68322f1d4..3f99556910d4 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs
@@ -24,6 +24,18 @@ public FrameRenderer() : base(Mapper, CommandMapper)
 			AddSubview(_actualView);
 		}
 
+		// TODO NET8 make public
+		internal FrameRenderer(IPropertyMapper mapper)
+			: this(mapper, CommandMapper)
+		{
+		}
+
+		// TODO NET8 make public
+		internal FrameRenderer(IPropertyMapper mapper, CommandMapper commandMapper) : base(mapper, commandMapper)
+		{
+			AutoPackage = false;
+		}
+
 		public override void AddSubview(UIView view)
 		{
 			if (view != _actualView)
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
index ad4964c8d4c2..518e86b17c5b 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
@@ -117,6 +117,11 @@ public FrameRendererTest(IPropertyMapper mapper, CommandMapper commandMapper)
 
 #else
 
+		public FrameRendererTest()
+		{
+
+		}
+
 		public FrameRendererTest(IPropertyMapper mapper)
 			: base(mapper)
 		{

From 1e40f85cc8156905037f9c015f8ffe90ba2f6f48 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 30 Nov 2022 17:27:38 -0600
Subject: [PATCH 10/10] - fix up windows

---
 .../Handlers/Windows/FrameRenderer.cs         |  8 ++++---
 .../Handlers/Windows/VisualElementRenderer.cs |  2 +-
 .../DeviceTests/Elements/Frame/FrameTests.cs  |  8 +++----
 .../HandlerTestBaseOfT.Windows.cs             | 22 ++++++++++---------
 .../ViewModels/TestAssemblyViewModel.cs       |  2 +-
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
index d55763e99092..79b77635fe7b 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs
@@ -82,9 +82,11 @@ void UpdatePadding()
 		{
 			Control.Arrange(new WRect(0, 0, finalSize.Width, finalSize.Height));
 			if (Element is IContentView cv)
-				cv.CrossPlatformArrange(new Rect(0, 0, finalSize.Width, finalSize.Height));
+			{
+				finalSize = cv.CrossPlatformArrange(new Rect(0, 0, finalSize.Width, finalSize.Height)).ToPlatform();
+			}
 
-			return finalSize;
+			return new global::Windows.Foundation.Size(Math.Max(0, finalSize.Width), Math.Max(0, finalSize.Height));
 		}
 
 		protected override global::Windows.Foundation.Size MeasureOverride(global::Windows.Foundation.Size availableSize)
@@ -92,7 +94,7 @@ void UpdatePadding()
 			var size = base.MeasureOverride(availableSize);
 
 			if (Element is IContentView cv)
-				size = cv.CrossPlatformMeasure(availableSize.Width, availableSize.Height).ToPlatform();
+				_ = cv.CrossPlatformMeasure(size.Width, size.Height);
 
 			return size;
 		}
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Windows/VisualElementRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Windows/VisualElementRenderer.cs
index d012931064a9..ad1b7c0cf439 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Windows/VisualElementRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Windows/VisualElementRenderer.cs
@@ -89,7 +89,7 @@ protected override WSize MeasureOverride(global::Windows.Foundation.Size availab
 			{
 				if (child is Maui.IElement childElement && childElement.Handler is IPlatformViewHandler nvh)
 				{
-					var size = nvh.GetDesiredSizeFromHandler(availableSize.Width, availableSize.Height);
+					var size = nvh.GetDesiredSizeFromHandler(width, height);
 					height = Math.Max(height, size.Height);
 					width = Math.Max(width, size.Width);
 				}
diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
index 518e86b17c5b..50ee529fd7cf 100644
--- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs
@@ -14,25 +14,25 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public class FrameStub : Frame, IStubBase
 	{
-		public double MaximumWidth
+		double IStubBase.MaximumWidth
 		{
 			get => base.MaximumWidthRequest;
 			set => base.MaximumWidthRequest = value;
 		}
 
-		public double MaximumHeight
+		double IStubBase.MaximumHeight
 		{
 			get => base.MaximumHeightRequest;
 			set => base.MaximumHeightRequest = value;
 		}
 
-		public double MinimumWidth
+		double IStubBase.MinimumWidth
 		{
 			get => base.MinimumWidthRequest;
 			set => base.MinimumWidthRequest = value;
 		}
 
-		public double MinimumHeight
+		double IStubBase.MinimumHeight
 		{
 			get => base.MinimumHeightRequest;
 			set => base.MinimumHeightRequest = value;
diff --git a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Windows.cs b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Windows.cs
index d39427ca81a5..8a3371b5f465 100644
--- a/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Windows.cs
+++ b/src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Windows.cs
@@ -177,12 +177,14 @@ protected string GetSemanticHint(IViewHandler viewHandler) =>
 		protected SemanticHeadingLevel GetSemanticHeading(IViewHandler viewHandler) =>
 			(SemanticHeadingLevel)AutomationProperties.GetHeadingLevel((FrameworkElement)viewHandler.PlatformView);
 
-		protected double GetOpacity(IViewHandler viewHandler) =>
-			((FrameworkElement)viewHandler.PlatformView).Opacity;
+		protected double GetOpacity(IViewHandler viewHandler)
+		{
+			return viewHandler.ToPlatform().Opacity;
+		}
 
 		double GetTranslationX(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.RenderTransform is CompositeTransform composite)
 				return composite.TranslateX;
@@ -191,7 +193,7 @@ double GetTranslationX(IViewHandler viewHandler)
 
 		double GetTranslationY(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.RenderTransform is CompositeTransform composite)
 				return composite.TranslateY;
@@ -200,7 +202,7 @@ double GetTranslationY(IViewHandler viewHandler)
 
 		double GetScaleX(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.RenderTransform is ScaleTransform scale)
 				return scale.ScaleX;
@@ -211,7 +213,7 @@ double GetScaleX(IViewHandler viewHandler)
 
 		double GetScaleY(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.RenderTransform is ScaleTransform scale)
 				return scale.ScaleY;
@@ -222,7 +224,7 @@ double GetScaleY(IViewHandler viewHandler)
 
 		double GetRotation(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.RenderTransform is CompositeTransform composite)
 				return composite.Rotation;
@@ -231,7 +233,7 @@ double GetRotation(IViewHandler viewHandler)
 
 		double GetRotationX(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.Projection is PlaneProjection projection)
 				return -projection.RotationX;
@@ -240,7 +242,7 @@ double GetRotationX(IViewHandler viewHandler)
 
 		double GetRotationY(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.Projection is PlaneProjection projection)
 				return -projection.RotationY;
@@ -249,7 +251,7 @@ double GetRotationY(IViewHandler viewHandler)
 
 		protected Visibility GetVisibility(IViewHandler viewHandler)
 		{
-			var platformView = (FrameworkElement)viewHandler.PlatformView;
+			var platformView = viewHandler.ToPlatform();
 
 			if (platformView.Visibility == UI.Xaml.Visibility.Visible && platformView.Opacity == 0)
 				return Visibility.Hidden;
diff --git a/src/TestUtils/src/DeviceTests.Runners/VisualRunner/ViewModels/TestAssemblyViewModel.cs b/src/TestUtils/src/DeviceTests.Runners/VisualRunner/ViewModels/TestAssemblyViewModel.cs
index 302ea0e8bb7b..465eb0e5bbf5 100644
--- a/src/TestUtils/src/DeviceTests.Runners/VisualRunner/ViewModels/TestAssemblyViewModel.cs
+++ b/src/TestUtils/src/DeviceTests.Runners/VisualRunner/ViewModels/TestAssemblyViewModel.cs
@@ -23,7 +23,7 @@ public class TestAssemblyViewModel : ViewModelBase
 		TestState _result;
 		TestState _resultFilter;
 		RunStatus _runStatus;
-		string? _searchQuery;
+		string? _searchQuery = "Frame";
 
 		string? _detailText;
 		string? _displayName;