dotnet · jfversluis · May 12, 2026 · May 6, 2026
diff --git a/src/Controls/src/Core/Editor/Editor.Android.cs b/src/Controls/src/Core/Editor/Editor.Android.cs
@@ -19,8 +19,7 @@ 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)
+		public static void MapText(EditorHandler2 handler, Editor editor)
 		{
 			if (handler.PlatformView is null)
 			{

diff --git a/src/Controls/src/Core/Entry/Entry.Android.cs b/src/Controls/src/Core/Entry/Entry.Android.cs
@@ -30,9 +30,8 @@ public static void MapText(IEntryHandler handler, Entry entry)
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView, entry);
 		}
 
-		// TODO: Material3: Make it public in .NET 11
 		// MaterialEntryHandler-specific overloads
-		internal static void MapImeOptions(EntryHandler2 handler, Entry entry)
+		public static void MapImeOptions(EntryHandler2 handler, Entry entry)
 		{
 			if (handler.PlatformView?.EditText is null)
 			{
@@ -42,8 +41,7 @@ internal static void MapImeOptions(EntryHandler2 handler, Entry entry)
 			Platform.EditTextExtensions.UpdateImeOptions(handler.PlatformView.EditText, entry);
 		}
 
-		// TODO: Material3: Make it public in .NET 11
-		internal static void MapText(EntryHandler2 handler, Entry entry)
+		public static void MapText(EntryHandler2 handler, Entry entry)
 		{
 			if (handler.PlatformView?.EditText is null)
 			{

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultForegroundColor -> Microsoft.Maui.Graphics.Color
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultTitleColor -> Microsoft.Maui.Graphics.Color
@@ -97,3 +97,7 @@ Microsoft.Maui.Controls.BoxView.~BoxView() -> void
 ~Microsoft.Maui.Controls.BoxView.Fill.get -> Microsoft.Maui.Controls.Brush
 ~Microsoft.Maui.Controls.BoxView.Fill.set -> void
 ~static readonly Microsoft.Maui.Controls.BoxView.FillProperty -> Microsoft.Maui.Controls.BindableProperty
+~static Microsoft.Maui.Controls.Editor.MapText(Microsoft.Maui.Handlers.EditorHandler2 handler, Microsoft.Maui.Controls.Editor editor) -> void
+~static Microsoft.Maui.Controls.Entry.MapImeOptions(Microsoft.Maui.Handlers.EntryHandler2 handler, Microsoft.Maui.Controls.Entry entry) -> void
+~static Microsoft.Maui.Controls.Entry.MapText(Microsoft.Maui.Handlers.EntryHandler2 handler, Microsoft.Maui.Controls.Entry entry) -> void
+~static Microsoft.Maui.Controls.SearchBar.MapText(Microsoft.Maui.Handlers.SearchBarHandler2 handler, Microsoft.Maui.Controls.SearchBar searchBar) -> void
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Android.cs b/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
@@ -14,8 +14,7 @@ public static void MapText(ISearchBarHandler handler, SearchBar searchBar)
 		}
 
 		// Material3 specific overload for SearchBarHandler2
-		// TODO: Material3: Make it public in .NET 11
-		internal static void MapText(SearchBarHandler2 handler, SearchBar searchBar)
+		public static void MapText(SearchBarHandler2 handler, SearchBar searchBar)
 		{
 			if (handler.PlatformView?.EditText is null)
 			{

diff --git a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.Android.cs
@@ -19,8 +19,7 @@ public static partial void MapColor(IActivityIndicatorHandler handler, IActivity
 		}
 	}
 
-	// TODO: material3 - make it public in .net 11
-	internal class ActivityIndicatorHandler2 : ActivityIndicatorHandler
+	public class ActivityIndicatorHandler2 : ActivityIndicatorHandler
 	{
 		protected override MaterialActivityIndicator CreatePlatformView()
 		{

diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler2.Android.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler2.Android.cs
@@ -6,8 +6,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: material3 - make it public in .net 11
-internal class DatePickerHandler2 : ViewHandler<IDatePicker, MauiMaterialDatePicker>
+public class DatePickerHandler2 : ViewHandler<IDatePicker, MauiMaterialDatePicker>
 {
     internal MaterialDatePicker? _dialog;
     internal bool _isUpdatingIsOpen;
@@ -295,8 +294,7 @@ internal void UpdateIsOpenState(bool isOpen)
     }
 }
 
-// TODO: material3 - make it public in .net 11
-internal class MaterialDatePickerPositiveButtonClickListener : Java.Lang.Object, IMaterialPickerOnPositiveButtonClickListener
+public class MaterialDatePickerPositiveButtonClickListener : Java.Lang.Object, IMaterialPickerOnPositiveButtonClickListener
 {
     readonly WeakReference<DatePickerHandler2> _handler;
 
@@ -326,8 +324,7 @@ public void OnPositiveButtonClick(Java.Lang.Object? selection)
     }
 }
 
-// TODO: material3 - make it public in .net 11
-internal class MaterialDatePickerDismissListener : Java.Lang.Object, IDialogInterfaceOnDismissListener
+public class MaterialDatePickerDismissListener : Java.Lang.Object, IDialogInterfaceOnDismissListener
 {
     readonly WeakReference<DatePickerHandler2> _handler;
 

diff --git a/src/Core/src/Handlers/Editor/EditorHandler2.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler2.Android.cs
@@ -7,8 +7,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: Material3 - make it public in .net 11
-internal class EditorHandler2 : ViewHandler<IEditor, MauiMaterialEditText>
+public class EditorHandler2 : ViewHandler<IEditor, MauiMaterialEditText>
 {
 	bool _set;
 

diff --git a/src/Core/src/Handlers/Entry/EntryHandler2.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler2.Android.cs
@@ -9,8 +9,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: Material3: Make it public in .NET 11
-internal class EntryHandler2 : ViewHandler<IEntry, MauiMaterialTextInputLayout>
+public class EntryHandler2 : ViewHandler<IEntry, MauiMaterialTextInputLayout>
 {
 	ClearButtonClickListener? _clearButtonClickListener;
 	ColorStateList? _defaultHintTextColors;

diff --git a/src/Core/src/Handlers/Image/ImageHandler2.Android.cs b/src/Core/src/Handlers/Image/ImageHandler2.Android.cs
@@ -2,8 +2,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: make it public in .net 11
-internal class ImageHandler2 : ImageHandler
+public class ImageHandler2 : ImageHandler
 {
     protected override ShapeableImageView CreatePlatformView()
     {

diff --git a/src/Core/src/Handlers/Label/LabelHandler.Android.cs b/src/Core/src/Handlers/Label/LabelHandler.Android.cs
@@ -127,8 +127,7 @@ public static void MapLineHeight(ILabelHandler handler, ILabel label)
 		}
 	}
 
-	// TODO: Material3 - make it public in .net 11
-	internal class LabelHandler2 : LabelHandler
+	public class LabelHandler2 : LabelHandler
 	{
 		protected override MauiMaterialTextView CreatePlatformView()
 		{

diff --git a/src/Core/src/Handlers/Picker/PickerHandler2.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler2.Android.cs
@@ -7,8 +7,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: Material3 - make it public in .net 11
-internal partial class PickerHandler2 : ViewHandler<IPicker, MauiMaterialPicker>
+public partial class PickerHandler2 : ViewHandler<IPicker, MauiMaterialPicker>
 {
 	AppCompatAlertDialog? _dialog;
 

diff --git a/src/Core/src/Handlers/ProgressBar/ProgressBarHandler2.Android.cs b/src/Core/src/Handlers/ProgressBar/ProgressBarHandler2.Android.cs
@@ -2,8 +2,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: Material3 - make it public in .net 11
-internal class ProgressBarHandler2 : ProgressBarHandler
+public class ProgressBarHandler2 : ProgressBarHandler
 {
 	protected override LinearProgressIndicator CreatePlatformView()
 	{

diff --git a/src/Core/src/Handlers/RadioButton/RadioButtonHandler2.Android.cs b/src/Core/src/Handlers/RadioButton/RadioButtonHandler2.Android.cs
@@ -2,8 +2,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: Material3 - make it public in .net 11
-internal class RadioButtonHandler2 : RadioButtonHandler
+public class RadioButtonHandler2 : RadioButtonHandler
 {
 	protected override MaterialRadioButton CreatePlatformView()
 	{

diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler2.Android.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler2.Android.cs
@@ -9,8 +9,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: material3 - make it public in .net 11
-internal class SearchBarHandler2 : ViewHandler<ISearchBar, MauiMaterialSearchBarTextInputLayout>
+public class SearchBarHandler2 : ViewHandler<ISearchBar, MauiMaterialSearchBarTextInputLayout>
 {
     public static PropertyMapper<ISearchBar, SearchBarHandler2> Mapper =
     new(ViewMapper)

diff --git a/src/Core/src/Handlers/Slider/SliderHandler2.Android.cs b/src/Core/src/Handlers/Slider/SliderHandler2.Android.cs
@@ -3,8 +3,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: Material3: Make it public in .NET 11
-internal class SliderHandler2 : ViewHandler<ISlider, Slider>
+public class SliderHandler2 : ViewHandler<ISlider, Slider>
 {
     public static PropertyMapper<ISlider, SliderHandler2> Mapper =
             new(ViewMapper)

diff --git a/src/Core/src/Handlers/Switch/SwitchHandler2.Android.cs b/src/Core/src/Handlers/Switch/SwitchHandler2.Android.cs
@@ -2,8 +2,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: material3 - make it public in .net 11
-internal class SwitchHandler2 : SwitchHandler
+public class SwitchHandler2 : SwitchHandler
 {
 	public static new PropertyMapper<ISwitch, SwitchHandler2> Mapper =
   	new(SwitchHandler.Mapper)

diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler2.Android.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler2.Android.cs
@@ -7,8 +7,7 @@
 
 namespace Microsoft.Maui.Handlers;
 
-// TODO: Material3: Make it public in .NET 11
-internal partial class TimePickerHandler2 : ViewHandler<ITimePicker, MauiMaterialTimePicker>
+public partial class TimePickerHandler2 : ViewHandler<ITimePicker, MauiMaterialTimePicker>
 {
     internal MaterialTimePicker? _dialog;
     internal bool _isUpdatingIsOpen;
@@ -238,7 +237,7 @@ internal void UpdateIsOpenState(bool isOpen)
             && VirtualView.Format == "t" || VirtualView.Format == "HH:mm");
 }
 
-internal class MaterialTimePickerPositiveButtonClickListener : Java.Lang.Object, View.IOnClickListener
+public class MaterialTimePickerPositiveButtonClickListener : Java.Lang.Object, View.IOnClickListener
 {
     readonly WeakReference<TimePickerHandler2> _handler;
 
@@ -262,7 +261,7 @@ public void OnClick(View? v)
     }
 }
 
-internal class MaterialTimePickerDismissListener : Java.Lang.Object, IDialogInterfaceOnDismissListener
+public class MaterialTimePickerDismissListener : Java.Lang.Object, IDialogInterfaceOnDismissListener
 {
     readonly WeakReference<TimePickerHandler2> _handler;
 

diff --git a/src/Core/src/Platform/Android/DatePickerExtensions.cs b/src/Core/src/Platform/Android/DatePickerExtensions.cs
@@ -78,18 +78,17 @@ internal static void SetText(this MauiDatePicker platformDatePicker, IDatePicker
 			platformDatePicker.Text = datePicker.Date?.ToString(datePicker.Format) ?? string.Empty;
 		}
 
-		// TODO: material3 - make it public in .net 11
-		internal static void UpdateDate(this MauiMaterialDatePicker platformDatePicker, IDatePicker datePicker)
+		public static void UpdateDate(this MauiMaterialDatePicker platformDatePicker, IDatePicker datePicker)
 		{
 			platformDatePicker.SetText(datePicker);
 		}
 
-		internal static void UpdateFormat(this MauiMaterialDatePicker platformDatePicker, IDatePicker datePicker)
+		public static void UpdateFormat(this MauiMaterialDatePicker platformDatePicker, IDatePicker datePicker)
 		{
 			platformDatePicker.SetText(datePicker);
 		}
 
-		internal static void UpdateTextColor(this MauiMaterialDatePicker platformDatePicker, IDatePicker datePicker)
+		public static void UpdateTextColor(this MauiMaterialDatePicker platformDatePicker, IDatePicker datePicker)
 		{
 			var textColor = datePicker.TextColor;
 

diff --git a/src/Core/src/Platform/Android/Material3Controls/MauiMaterialDatePicker.cs b/src/Core/src/Platform/Android/Material3Controls/MauiMaterialDatePicker.cs
@@ -11,8 +11,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-// TODO: material3 - make it public in .net 11
-internal class MauiMaterialDatePicker : TextInputEditText, IOnClickListener
+public class MauiMaterialDatePicker : TextInputEditText, IOnClickListener
 {
     public MauiMaterialDatePicker(Context context) : base(MauiMaterialContextThemeWrapper.Create(context))
     {

diff --git a/src/Core/src/Platform/Android/Material3Controls/MauiMaterialEditText.cs b/src/Core/src/Platform/Android/Material3Controls/MauiMaterialEditText.cs
@@ -7,8 +7,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-// TODO: Material3 - make it public in .net 11
-internal class MauiMaterialEditText : TextInputEditText
+public class MauiMaterialEditText : TextInputEditText
 {
 	public event EventHandler? SelectionChanged;
 
@@ -50,8 +49,7 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 	}
 }
 
-// TODO: Material3: Make it public in .NET 11
-internal class MauiMaterialTextInputLayout : TextInputLayout
+public class MauiMaterialTextInputLayout : TextInputLayout
 {
 	public MauiMaterialTextInputLayout(Context context) : base(context)
 	{

diff --git a/src/Core/src/Platform/Android/Material3Controls/MauiMaterialPicker.cs b/src/Core/src/Platform/Android/Material3Controls/MauiMaterialPicker.cs
@@ -5,8 +5,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-// TODO: Material3 - make it public in .net 11
-internal class MauiMaterialPicker : MauiMaterialPickerBase
+public class MauiMaterialPicker : MauiMaterialPickerBase
 {
 	public MauiMaterialPicker(Context context) : base(context)
 	{
@@ -24,8 +23,7 @@ protected override void Dispose(bool disposing)
 	}
 }
 
-// TODO: Material3 - make it public in .net 11
-internal class MauiMaterialPickerBase : TextInputEditText
+public class MauiMaterialPickerBase : TextInputEditText
 {
 	public MauiMaterialPickerBase(Context context) : base(MauiMaterialContextThemeWrapper.Create(context))
 	{

diff --git a/src/Core/src/Platform/Android/Material3Controls/MauiMaterialTextView.cs b/src/Core/src/Platform/Android/Material3Controls/MauiMaterialTextView.cs
@@ -5,8 +5,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-// TODO: Material3 - make it public in .net 11
-internal class MauiMaterialTextView : MaterialTextView
+public class MauiMaterialTextView : MaterialTextView
 {
 	// Track text type to optimize layout events - FormattedText needs span recalculation, plain text doesn't
 	bool _isFormatted;

diff --git a/src/Core/src/Platform/Android/MaterialActivityIndicator.cs b/src/Core/src/Platform/Android/MaterialActivityIndicator.cs
@@ -6,8 +6,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-// TODO: material3 - make it public in .net 11
-internal class MaterialActivityIndicator : CircularProgressIndicator
+public class MaterialActivityIndicator : CircularProgressIndicator
 {
     public MaterialActivityIndicator(Context context)
      : base(MauiMaterialContextThemeWrapper.Create(context))

diff --git a/src/Core/src/Platform/Android/MauiMaterialContextThemeWrapper.cs b/src/Core/src/Platform/Android/MauiMaterialContextThemeWrapper.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-internal class MauiMaterialContextThemeWrapper : ContextThemeWrapper
+public class MauiMaterialContextThemeWrapper : ContextThemeWrapper
 {
     // IsMaterial3Enabled Flag needed for Control Level theming. App Level theming is handled in MauiAppCompatActivity
     public MauiMaterialContextThemeWrapper(Context context)

diff --git a/src/Core/src/Platform/Android/MauiMaterialSearchBarTextInputLayout.cs b/src/Core/src/Platform/Android/MauiMaterialSearchBarTextInputLayout.cs
@@ -5,8 +5,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-// TODO: material3 - make it public in .net 11
-internal class MauiMaterialSearchBarTextInputLayout : TextInputLayout
+public class MauiMaterialSearchBarTextInputLayout : TextInputLayout
 {
     public MauiMaterialSearchBarTextInputLayout(Context context) : base(context)
     {
@@ -47,8 +46,7 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
     }
 }
 
-// TODO: material3 - make it public in .net 11
-internal class MauiMaterialSearchBarTextInputEditText : TextInputEditText
+public class MauiMaterialSearchBarTextInputEditText : TextInputEditText
 {
     public event EventHandler? SelectionChanged;
     public MauiMaterialSearchBarTextInputEditText(Context context) : base(context)

diff --git a/src/Core/src/Platform/Android/MauiMaterialTimePicker.cs b/src/Core/src/Platform/Android/MauiMaterialTimePicker.cs
@@ -10,8 +10,7 @@
 
 namespace Microsoft.Maui.Platform;
 
-// TODO: material3 - make it public in .net 11
-internal class MauiMaterialTimePicker : TextInputEditText, IOnClickListener
+public class MauiMaterialTimePicker : TextInputEditText, IOnClickListener
 {
     public MauiMaterialTimePicker(Context context) : base(MauiMaterialContextThemeWrapper.Create(context))
     {