chore: wip

src/Uno.UI.Maps/MapPresenter.cs

@@ -25,7 +25,7 @@ private void UpdateOwnerSubscriptions()
 		{
 			_ownerSubscription.Disposable = null;
 
-			_owner = TemplatedParent as MapControl;
+			_owner = GetTemplatedParent() as MapControl;
 
 			if (_owner != null)
 			{

src/Uno.UI.RuntimeTests/Tests/TemplatedParent/Setup/Uno12624.xaml.cs

@@ -21,7 +21,11 @@ public partial class Uno12624_LeftRightControl : Control
 		typeof(Uno12624_LeftRightControl),
 		new PropertyMetadata(default(object)));
 
+#if !__ANDROID__
 	public object Left
+#else
+	public new object Left
+#endif
 	{
 		get => (object)GetValue(LeftProperty);
 		set => SetValue(LeftProperty, value);
@@ -36,7 +40,11 @@ public object Left
 		typeof(Uno12624_LeftRightControl),
 		new PropertyMetadata(default(object)));
 
+#if !__ANDROID__
 	public object Right
+#else
+	public new object Right
+#endif
 	{
 		get => (object)GetValue(RightProperty);
 		set => SetValue(RightProperty, value);

src/Uno.UI.RuntimeTests/Tests/TemplatedParent/Setup/Uno17313.xaml.cs

@@ -11,7 +11,7 @@ public Uno17313()
 	}
 }
 
-public class Uno17313_HeaderedCC : ContentControl
+public partial class Uno17313_HeaderedCC : ContentControl
 {
 	#region DependencyProperty: Header
 
@@ -45,6 +45,6 @@ public DataTemplate HeaderTemplate
 	#endregion
 }
 
-public class Uno17313_Expander : Uno17313_HeaderedCC { }
-public class Uno17313_SettingsExpander : Uno17313_HeaderedCC { }
-public class Uno17313_SettingsCard : Uno17313_HeaderedCC { }
+public partial class Uno17313_Expander : Uno17313_HeaderedCC { }
+public partial class Uno17313_SettingsExpander : Uno17313_HeaderedCC { }
+public partial class Uno17313_SettingsCard : Uno17313_HeaderedCC { }

src/Uno.UI.RuntimeTests/Tests/TemplatedParent/Setup/Uno9059.xaml.cs

@@ -25,7 +25,7 @@ public Uno9059_VM(Action action)
 
 	public Uno9059_RelayCommand CustomCommand { get; set; }
 }
-public class Uno9059_CustomControl : Control
+public partial class Uno9059_CustomControl : Control
 {
 	#region DependencyProperty: Action1
 

src/Uno.UI/UI/Xaml/Controls/Pivot/PivotAdapter.Android.cs

@@ -83,7 +83,6 @@ private void UpdateAdapter()
 					var fragment = new PivotItemFragment(pivotItem)
 					{
 						DataContext = _pivot.DataContext,
-						TemplatedParent = (IFrameworkElement)_pivot.GetTemplatedParent()
 					};
 					return fragment;
 				})

src/Uno.UI/UI/Xaml/Controls/Pivot/PivotItemFragment.Android.cs

@@ -64,7 +64,6 @@ private void Update()
 			if (UserVisibleHint && _created && _item != null)
 			{
 				_item.DataContext = _dataContext;
-				_item.SetTemplatedParent(_templatedParent);
 			}
 		}
 

src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.wasm.cs

@@ -203,7 +203,7 @@ private void OnPointerWheelChanged(object _, PointerRoutedEventArgs args)
 
 		private void RestoreScroll()
 		{
-			if (TemplatedParent is ScrollViewer sv)
+			if (GetTemplatedParent() is ScrollViewer sv)
 			{
 				if (sv.HorizontalOffset > 0 || sv.VerticalOffset > 0)
 				{
@@ -308,7 +308,7 @@ internal bool Set(
 						// If those values are invalid, the browser will raise the final event anyway.
 						// Note: If the caller has allowed animation, we assume that it's not interested by a sync response,
 						//		 we prefer to wait for the browser to effectively scroll.
-						(TemplatedParent as ScrollViewer)?.OnPresenterScrolled(
+						(GetTemplatedParent() as ScrollViewer)?.OnPresenterScrolled(
 							horizontalOffset ?? nativeHorizontalOffset,
 							verticalOffset ?? nativeVerticalOffset,
 							isIntermediate: false