March 2, 2026 Candidate Branch

src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-sc.aotprofile.txt

@@ -8028,14 +8028,12 @@ Methods:
 	void Microsoft.Maui.PlatformDispatcher:.cctor ()
 	void Microsoft.Maui.PlatformDispatcher:.ctor (intptr,Android.Runtime.JniHandleOwnership)
 	void Microsoft.Maui.PlatformInterop:.cctor ()
-	void Microsoft.Maui.PlatformInterop:DrawMauiDrawablePath (Android.Graphics.Drawables.PaintDrawable,Android.Graphics.Canvas,int,int,Android.Graphics.Path,Android.Graphics.Paint)
 	void Microsoft.Maui.PlatformInterop:LoadImageFromFont (Android.Content.Context,int,string,Android.Graphics.Typeface,single,Microsoft.Maui.IImageLoaderCallback)
 	void Microsoft.Maui.PlatformInterop:LoadImageFromFont (Android.Widget.ImageView,int,string,Android.Graphics.Typeface,single,Microsoft.Maui.IImageLoaderCallback)
 	void Microsoft.Maui.PlatformInterop:RemoveFromParent (Android.Views.View)
 	void Microsoft.Maui.PlatformInterop:RequestLayoutIfNeeded (Android.Views.View)
 	void Microsoft.Maui.PlatformInterop:Set (Android.Views.View,int,int,int,int,bool,single,single,single,single,single,single,single,single,single,single)
 	void Microsoft.Maui.PlatformInterop:SetColorFilter (Android.Graphics.Drawables.Drawable,int,int)
-	void Microsoft.Maui.PlatformInterop:SetPaintValues (Android.Graphics.Paint,single,Android.Graphics.Paint/Join,Android.Graphics.Paint/Cap,single,Android.Graphics.PathEffect)
 	void Microsoft.Maui.PlatformInterop:SetPivotXIfNeeded (Android.Views.View,single)
 	void Microsoft.Maui.PlatformInterop:SetPivotYIfNeeded (Android.Views.View,single)
 	void Microsoft.Maui.PlatformMauiAppCompatActivity:.cctor ()

src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs

@@ -365,6 +365,24 @@ void HandlePropertyChanged(object sender, PropertyChangedEventArgs e)
 		void LayoutChildren(bool animated)
 		{
 			var frame = Element.Bounds.ToCGRect();
+
+			// Apply safe area insets to the FlyoutPage container if UseSafeArea is enabled.
+			// This ensures the Flyout content (e.g., CollectionView) renders below the status bar/notch
+			// on iOS devices with notches (iPhone X and newer). Without this adjustment, the container
+			// would start at Y=0, causing content to overlap with the status bar.
+			// https://github.com/dotnet/maui/issues/29170
+			if (Element is FlyoutPage flyoutPage && flyoutPage is ISafeAreaView sav &&
+			 !sav.IgnoreSafeArea && OperatingSystem.IsIOSVersionAtLeast(11))
+			{
+				var safeAreaTopInset = View.SafeAreaInsets.Top;
+
+				if (safeAreaTopInset > 0)
+				{
+					frame.Y = safeAreaTopInset;
+					frame.Height -= safeAreaTopInset;
+				}
+			}
+
 			var flyoutFrame = frame;
 			nfloat opacity = 1;
 

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

@@ -946,6 +946,17 @@ void UpdateBarTextColor()
 			NavigationBar.TintColor = iconColor == null || NavPage.OnThisPlatform().GetStatusBarTextColorMode() == StatusBarTextColorMode.DoNotAdjust
 				? UINavigationBar.Appearance.TintColor
 				: iconColor.ToPlatform();
+
+			if ((OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)) && NavigationBar.TintColor is not null)
+			{
+				if (VisibleViewController?.NavigationItem?.RightBarButtonItems is UIBarButtonItem[] items)
+				{
+					foreach (var item in items)
+					{
+						item.TintColor = NavigationBar.TintColor;
+					}
+				}
+			}
 		}
 
 		void SetStatusBarStyle()
@@ -1064,7 +1075,7 @@ internal static void SetFlyoutLeftBarButton(UIViewController containerController
 				// We only check height because the navigation bar constrains vertical space (44pt height),
 				// but allows horizontal flexibility. Width can vary based on icon design and content,
 				// while height must fit within the fixed navigation bar bounds to avoid clipping.
-				
+
 				// if the image is bigger than the default available size, resize it
 				if (icon is not null)
 				{
@@ -1602,12 +1613,28 @@ UIImage GetEmptyBackIndicatorImage()
 				return empty;
 			}
 
+			/// <summary>
+			/// Called when the view controller's view transitions to a new size.
+			/// On iPad iOS 26+, manually updates TitleView frame to handle Stage Manager window resizing.
+			/// </summary>
 			public override void ViewWillTransitionToSize(SizeF toSize, IUIViewControllerTransitionCoordinator coordinator)
 			{
 				base.ViewWillTransitionToSize(toSize, coordinator);
 
 				if (UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad)
+				{
 					UpdateLeftBarButtonItem();
+
+					// For iOS 26+, force TitleView to re-layout on window size changes (iPad Stage Manager, multitasking)
+					// Complements TraitCollectionDidChange handling (device rotation) added in #32815
+					if (OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26))
+					{
+						coordinator.AnimateAlongsideTransition(_ =>
+						{
+							UpdateTitleViewFrameForOrientation();
+						}, null);
+					}
+				}
 			}
 
 			public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
@@ -1937,6 +1964,14 @@ void UpdateToolbarItems()
 				}
 
 				NavigationItem.SetRightBarButtonItems(primaries is null ? [] : primaries.ToArray(), false);
+				if ((OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)) && primaries is not null && _navigation.TryGetTarget(out NavigationRenderer navigationRenderer)
+					  && navigationRenderer.NavigationBar?.TintColor is UIColor tintColor)
+				{
+					foreach (var item in primaries)
+					{
+						item.TintColor = tintColor;
+					}
+				}
 
 				if (_navigation.TryGetTarget(out NavigationRenderer n))
 				{

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellContentFragment.cs

@@ -222,6 +222,21 @@ void Destroy()
 			_shellPageContainer = null;
 		}
 
+		internal void DisposePage()
+		{
+			if (_destroyed)
+			{
+				return;
+			}
+			Destroy();
+
+			if (_page is not null)
+			{
+				_page.DisconnectHandlers();
+				_page = null;
+			}
+		}
+
 		protected override void Dispose(bool disposing)
 		{
 			if (_disposed)

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutRecyclerAdapter.cs

@@ -139,6 +139,16 @@ public override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup parent, int
 
 			var container = new ContainerView(parent.Context, content, MauiContext);
 			container.MatchWidth = true;
+
+			// In Auto or Disabled scroll modes, RecyclerView passes an EXACTLY heightMeasureSpec,
+			// causing items to be measured to the full RecyclerView height.
+			// Setting MeasureHeight = true forces UNSPECIFIED mode, allowing items to use their natural height (~48dp).
+			// This enables RecyclerView to detect when scrolling is needed and to create all required view holders.
+			if (_shellContext.Shell.FlyoutVerticalScrollMode != ScrollMode.Enabled)
+			{
+				container.MeasureHeight = true;
+			}
+
 			container.LayoutParameters = new LP(LP.MatchParent, LP.WrapContent);
 			linearLayout.AddView(container);
 

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutRenderer.cs

@@ -260,8 +260,15 @@ void AddFlyoutContentToLayoutIfNeeded(FlyoutBehavior behavior)
 
 		protected virtual void OnShellPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			if (_flyoutContent == null)
+			if (e.PropertyName == Shell.FlowDirectionProperty.PropertyName)
+			{
+				UpdateFlowDirection();
+			}
+
+			if (_flyoutContent is null)
+			{
 				return;
+			}
 
 			if (e.PropertyName == Shell.FlyoutIsPresentedProperty.PropertyName)
 			{
@@ -275,10 +282,6 @@ protected virtual void OnShellPropertyChanged(object sender, PropertyChangedEven
 
 				UpdateDrawerState();
 			}
-			else if (e.PropertyName == Shell.FlowDirectionProperty.PropertyName)
-			{
-				UpdateFlowDirection();
-			}
 		}
 
 		void UpdateDrawerState()

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs

@@ -310,6 +310,7 @@ protected virtual void UpdateFlyoutContent()
 
 			_rootView.AddView(_flyoutContentView, index);
 			UpdateContentPadding();
+			UpdateVerticalScrollMode();
 		}
 
 
@@ -932,7 +933,6 @@ public RecyclerViewContainer(Context context) : base(context)
 		{
 			SetClipToPadding(false);
 			SetLayoutManager(_layoutManager = new ScrollLayoutManager(context, (int)Orientation.Vertical, false));
-			SetLayoutManager(new LinearLayoutManager(context, (int)Orientation.Vertical, false));
 		}
 
 		protected override void Dispose(bool disposing)

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRendererBase.cs

@@ -167,6 +167,11 @@ protected virtual Task<bool> HandleFragmentUpdate(ShellNavigationSource navSourc
 						if (ChildFragmentManager.Contains(removeFragment.Fragment) && !isForCurrentTab && removeFragment != _currentFragment)
 							RemoveFragment(removeFragment.Fragment);
 						_fragmentMap.Remove(page);
+
+						if (removeFragment is ShellContentFragment shellFragment)
+						{
+							shellFragment.DisposePage();
+						}
 					}
 
 					if (!isForCurrentTab && removeFragment != _currentFragment)

src/Controls/src/Core/Editor/Editor.Android.cs

@@ -18,5 +18,22 @@ public static void MapText(IEditorHandler handler, Editor editor)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
 		}
+
+		// TODO: Material3 - make it public in .net 11
+		internal static void MapText(EditorHandler2 handler, Editor editor)
+		{
+			if (handler.PlatformView is null)
+			{
+				return;
+			}
+
+			if (handler.DataFlowDirection == DataFlowDirection.FromPlatform)
+			{
+				Platform.EditTextExtensions.UpdateTextFromPlatform(handler.PlatformView, editor);
+				return;
+			}
+
+			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
+		}
 	}
 }

src/Controls/src/Core/Editor/Editor.Mapper.cs

@@ -15,6 +15,16 @@ public partial class Editor
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(Text), MapText);
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(TextTransform), MapText);
 
+#if ANDROID
+			if (RuntimeFeature.IsMaterial3Enabled)
+			{
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(Text), MapText);
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(TextTransform), MapText);
+				EditorHandler2.Mapper.AppendToMapping<Editor, EditorHandler2>(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
+				EditorHandler2.CommandMapper.PrependToMapping<Editor, EditorHandler2>(nameof(IEditor.Focus), InputView.MapFocus);
+			}
+#endif
+
 #if IOS || ANDROID
 			EditorHandler.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
 			EditorHandler.Mapper.AppendToMapping(nameof(VisualElement.IsVisible), InputView.MapIsVisible);

src/Controls/src/Core/FlyoutPage/FlyoutPage.cs

@@ -351,6 +351,12 @@ void OnWindowChanged(object sender, EventArgs e)
 		void OnMainDisplayInfoChanged(object sender, DisplayInfoChangedEventArgs e)
 		{
 			Handler?.UpdateValue(nameof(FlyoutBehavior));
+
+#if ANDROID || WINDOWS
+			// Trigger toolbar re-evaluation on orientation change. iOS handles this natively
+			// via PhoneFlyoutPageRenderer.ViewWillTransitionToSize().
+			OnPropertyChanged(nameof(FlyoutLayoutBehavior));
+#endif
 		}
 
 		IView IFlyoutView.Flyout => this.Flyout;

src/Controls/src/Core/FontExtensions.cs

@@ -34,5 +34,20 @@ public static Font ToFont(this IFontElement element, double? defaultSize = null)
 
 			return Font.OfSize(element.FontFamily, size, enableScaling: element.FontAutoScalingEnabled).WithAttributes(element.FontAttributes);
 		}
+
+		internal static Font GetEffectiveFont(this Span span, double defaultFontSize, Font? defaultFont)
+		{
+			var fontFamily = span.IsSet(Span.FontFamilyProperty) ? span.FontFamily : defaultFont?.Family;
+			var fontSize = span.IsSet(Span.FontSizeProperty) ? span.FontSize : defaultFontSize;
+			var fontAttributes = span.IsSet(Span.FontAttributesProperty)
+				? span.FontAttributes
+				: (defaultFont?.GetFontAttributes() ?? FontAttributes.None);
+			var autoScaling = span.IsSet(Span.FontAutoScalingEnabledProperty)
+				? span.FontAutoScalingEnabled
+				: (defaultFont?.AutoScalingEnabled ?? true);
+
+			return Font.OfSize(fontFamily, fontSize, enableScaling: autoScaling)
+				.WithAttributes(fontAttributes);
+		}
 	}
 }

src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs

@@ -524,6 +524,28 @@ protected virtual void LayoutPropertyChanged(object sender, PropertyChangedEvent
 			}
 		}
 
+		public override bool OnTouchEvent(MotionEvent e)
+		{
+			// If ItemsView is disabled, don't handle touch events
+			if (ItemsView?.IsEnabled == false)
+			{
+				return false;
+			}
+
+			return base.OnTouchEvent(e);
+		}
+
+		public override bool OnInterceptTouchEvent(MotionEvent e)
+		{
+			// If ItemsView is disabled, intercept all touch events to prevent interactions
+			if (ItemsView?.IsEnabled == false)
+			{
+				return true;
+			}
+
+			return base.OnInterceptTouchEvent(e);
+		}
+
 		protected override void OnLayout(bool changed, int l, int t, int r, int b)
 		{
 			base.OnLayout(changed, l, t, r, b);

src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs

@@ -12,6 +12,7 @@ public class RecyclerViewScrollListener<TItemsView, TItemsViewSource> : Recycler
 		int _horizontalOffset, _verticalOffset;
 		TItemsView _itemsView;
 		readonly bool _getCenteredItemOnXAndY = false;
+		bool _hasCompletedFirstLayout = false;
 
 		public RecyclerViewScrollListener(TItemsView itemsView, ItemsViewAdapter<TItemsView, TItemsViewSource> itemsViewAdapter) : this(itemsView, itemsViewAdapter, false)
 		{
@@ -28,6 +29,8 @@ public RecyclerViewScrollListener(TItemsView itemsView, ItemsViewAdapter<TItemsV
 		internal void UpdateAdapter(ItemsViewAdapter<TItemsView, TItemsViewSource> itemsViewAdapter)
 		{
 			ItemsViewAdapter = itemsViewAdapter;
+			// Reset flag when adapter changes to handle ItemsSource updates
+			_hasCompletedFirstLayout = false;
 		}
 
 		public override void OnScrolled(RecyclerView recyclerView, int dx, int dy)
@@ -38,6 +41,17 @@ public override void OnScrolled(RecyclerView recyclerView, int dx, int dy)
 			_horizontalOffset = itemCount == 0 ? 0 : _horizontalOffset + dx;
 			_verticalOffset = itemCount == 0 ? 0 : _verticalOffset + dy;
 
+			// Prevent the Scrolled event from firing on the very first layout callback only.
+			// This is the initial OnScrolled(0,0) call when the view is first laid out.
+			// After that, layout is marked as complete and all subsequent scroll events are allowed.
+			if (!_hasCompletedFirstLayout && !recyclerView.IsLaidOut && dx == 0 && dy == 0)
+			{
+				return;
+			}
+
+			// Mark that first layout has been processed - all future scrolls should fire events
+			_hasCompletedFirstLayout = true;
+
 			var (First, Center, Last) = GetVisibleItemsIndex(recyclerView);
 			var itemsViewScrolledEventArgs = new ItemsViewScrolledEventArgs
 			{
@@ -54,21 +68,30 @@ public override void OnScrolled(RecyclerView recyclerView, int dx, int dy)
 
 			// Don't send RemainingItemsThresholdReached event for non-linear layout managers
 			// This can also happen if a layout pass has not happened yet
-			if (Last == -1)
+			if (Last == -1 || ItemsViewAdapter is null || _itemsView.RemainingItemsThreshold == -1)
+			{
+				return;
+			}
+
+			var itemsSource = ItemsViewAdapter.ItemsSource;
+			int headerValue = itemsSource.HasHeader ? 1 : 0;
+			int footerValue = itemsSource.HasFooter ? 1 : 0;
+
+			// Calculate actual data item count (excluding header and footer positions)
+			int actualItemCount = ItemsViewAdapter.ItemCount - footerValue - headerValue;
+
+			// Ensure we're within the data items region (not in header/footer)
+			if (Last < headerValue || Last > actualItemCount)
+			{
 				return;
+			}
+
+			// Check if we're at or within threshold distance from the last data item
+			bool isThresholdReached = (Last == actualItemCount - 1) || (actualItemCount - 1 - Last <= _itemsView.RemainingItemsThreshold);
 
-			switch (_itemsView.RemainingItemsThreshold)
+			if (isThresholdReached)
 			{
-				case -1:
-					return;
-				case 0:
-					if (Last == ItemsViewAdapter.ItemsSource.Count - 1)
-						_itemsView.SendRemainingItemsThresholdReached();
-					break;
-				default:
-					if (ItemsViewAdapter.ItemsSource.Count - 1 - Last <= _itemsView.RemainingItemsThreshold)
-						_itemsView.SendRemainingItemsThresholdReached();
-					break;
+				_itemsView.SendRemainingItemsThresholdReached();
 			}
 		}