dotnet · jfversluis · Feb 26, 2026 · Dec 24, 2025 · Dec 26, 2025 · Dec 26, 2025
diff --git a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
@@ -69,6 +69,18 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
 #else
 		handlersCollection.AddHandler<CollectionView, CollectionViewHandler>();
 		handlersCollection.AddHandler<CarouselView, CarouselViewHandler>();
+#endif
+#if ANDROID
+		if (RuntimeFeature.IsMaterial3Enabled)
+		{
+			handlersCollection.AddHandler<TimePicker, TimePickerHandler2>();
+		}
+		else
+		{
+			handlersCollection.AddHandler<TimePicker, TimePickerHandler>();
+		}
+#else
+		handlersCollection.AddHandler<TimePicker, TimePickerHandler>();
 #endif
 		handlersCollection.AddHandler<Application, ApplicationHandler>();
 		handlersCollection.AddHandler<ActivityIndicator, ActivityIndicatorHandler>();
@@ -87,7 +99,6 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
 		handlersCollection.AddHandler<Slider, SliderHandler>();
 		handlersCollection.AddHandler<Stepper, StepperHandler>();
 		handlersCollection.AddHandler<Switch, SwitchHandler>();
-		handlersCollection.AddHandler<TimePicker, TimePickerHandler>();
 		handlersCollection.AddHandler<Page, PageHandler>();
 		handlersCollection.AddHandler<WebView, WebViewHandler>();
 		if (RuntimeFeature.IsHybridWebViewSupported)

diff --git a/...apshots/android-notch-36/Material3TimePicker_InitialState_VerifyVisualState.png b/...apshots/android-notch-36/Material3TimePicker_InitialState_VerifyVisualState.png
diff --git a/...shots/android-notch-36/Material3TimePicker_SetCulture_arEG_VerifyTimeFormat.png b/...shots/android-notch-36/Material3TimePicker_SetCulture_arEG_VerifyTimeFormat.png
diff --git a/...shots/android-notch-36/Material3TimePicker_SetCulture_enUS_VerifyTimeFormat.png b/...shots/android-notch-36/Material3TimePicker_SetCulture_enUS_VerifyTimeFormat.png
diff --git a/...shots/android-notch-36/Material3TimePicker_SetCulture_jaJP_VerifyTimeFormat.png b/...shots/android-notch-36/Material3TimePicker_SetCulture_jaJP_VerifyTimeFormat.png
diff --git a/...tch-36/Material3TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png b/...tch-36/Material3TimePicker_SetFontAttributesAndFontFamily_VerifyVisualState.png
diff --git a/...notch-36/Material3TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png b/...notch-36/Material3TimePicker_SetFontAttributesAndFontSize_VerifyVisualState.png
diff --git a/...d-notch-36/Material3TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png b/...d-notch-36/Material3TimePicker_SetFontAttributesAndFormat_VerifyVisualState.png
diff --git a/...oid-notch-36/Material3TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png b/...oid-notch-36/Material3TimePicker_SetFontFamilyAndFontSize_VerifyVisualState.png
diff --git a/...droid-notch-36/Material3TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png b/...droid-notch-36/Material3TimePicker_SetFontFamilyAndFormat_VerifyVisualState.png
diff --git a/...android-notch-36/Material3TimePicker_SetFontSizeAndFormat_VerifyVisualState.png b/...android-notch-36/Material3TimePicker_SetFontSizeAndFormat_VerifyVisualState.png
diff --git a/...ts/android-notch-36/Material3TimePicker_SetFormatTAndTime_VerifyVisualState.png b/...ts/android-notch-36/Material3TimePicker_SetFormatTAndTime_VerifyVisualState.png
diff --git a/...tch-36/Material3TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png b/...tch-36/Material3TimePicker_SetFormat_T_WithFontAttributes_VerifyVisualState.png
diff --git a/...d-notch-36/Material3TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png b/...d-notch-36/Material3TimePicker_SetFormat_T_WithFontFamily_VerifyVisualState.png
diff --git a/...oid-notch-36/Material3TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png b/...oid-notch-36/Material3TimePicker_SetFormat_T_WithFontSize_VerifyVisualState.png
diff --git a/.../android-notch-36/Material3TimePicker_SetFormat_t_AndTime_VerifyVisualState.png b/.../android-notch-36/Material3TimePicker_SetFormat_t_AndTime_VerifyVisualState.png
diff --git a/.../snapshots/android-notch-36/Material3TimePicker_SetShadow_VerifyVisualState.png b/.../snapshots/android-notch-36/Material3TimePicker_SetShadow_VerifyVisualState.png
diff --git a/...d-notch-36/Material3TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png b/...d-notch-36/Material3TimePicker_SetTimeAndCharacterSpacing_VerifyVisualState.png
diff --git a/.../android-notch-36/Material3TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png b/.../android-notch-36/Material3TimePicker_SetTimeAndIsEnabled_VerifyVisualState.png
diff --git a/.../android-notch-36/Material3TimePicker_SetTimeAndTextColor_VerifyVisualState.png b/.../android-notch-36/Material3TimePicker_SetTimeAndTextColor_VerifyVisualState.png