[Android] Fix for TimePicker Dialog doesn't update the layout when rotating the device with dialog open

src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs

@@ -3,13 +3,17 @@
 using Android.Content.Res;
 using Android.Graphics.Drawables;
 using Android.Text.Format;
+using Android.Views;
+using Microsoft.Maui.Devices;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class TimePickerHandler : ViewHandler<ITimePicker, MauiTimePicker>
 	{
 		MauiTimePicker? _timePicker;
 		TimePickerDialog? _dialog;
+		int _currentHour;
+		int _currentMinute;
 
 		protected override MauiTimePicker CreatePlatformView()
 		{
@@ -22,22 +26,60 @@ protected override MauiTimePicker CreatePlatformView()
 			return _timePicker;
 		}
 
+		protected override void ConnectHandler(MauiTimePicker platformView)
+		{
+			base.ConnectHandler(platformView);
+			platformView.ViewAttachedToWindow += OnViewAttachedToWindow;
+			platformView.ViewDetachedFromWindow += OnViewDetachedFromWindow;
+
+			if (platformView.IsAttachedToWindow)
+			{
+				OnViewAttachedToWindow();
+			}
+		}
+
+		void OnViewDetachedFromWindow(object? sender = null, View.ViewDetachedFromWindowEventArgs? e = null)
+		{
+			// Called when an activity is destroyed or view is detached
+			DeviceDisplay.MainDisplayInfoChanged -= OnMainDisplayInfoChanged;
+		}
+
+		void OnViewAttachedToWindow(object? sender = null, View.ViewAttachedToWindowEventArgs? e = null)
+		{
+			DeviceDisplay.MainDisplayInfoChanged += OnMainDisplayInfoChanged;
+		}
+
 		protected override void DisconnectHandler(MauiTimePicker platformView)
 		{
 			if (_dialog != null)
 			{
 				_dialog.Hide();
+				_dialog.Dispose();
 				_dialog = null;
 			}
+
+			platformView.ViewAttachedToWindow -= OnViewAttachedToWindow;
+			platformView.ViewDetachedFromWindow -= OnViewDetachedFromWindow;
+			OnViewDetachedFromWindow();
+
+			base.DisconnectHandler(platformView);
 		}
 
 		protected virtual TimePickerDialog CreateTimePickerDialog(int hour, int minute)
 		{
+			// Store the current values for orientation change handling
+			_currentHour = hour;
+			_currentMinute = minute;
+
 			void onTimeSetCallback(object? obj, TimePickerDialog.TimeSetEventArgs args)
 			{
 				if (VirtualView == null || PlatformView == null)
 					return;
 
+				// Update stored values when user selects time
+				_currentHour = args.HourOfDay;
+				_currentMinute = args.Minute;
+
 				VirtualView.Time = new TimeSpan(args.HourOfDay, args.Minute, 0);
 				VirtualView.IsFocused = false;
 
@@ -87,8 +129,15 @@ public static void MapTextColor(ITimePickerHandler handler, ITimePicker timePick
 
 		void ShowPickerDialog()
 		{
-			if (VirtualView == null)
+			if (VirtualView is null)
+			{
 				return;
+			}
+
+			if (_dialog is not null && _dialog.IsShowing)
+			{
+				return;
+			}
 
 			var time = VirtualView.Time;
 			ShowPickerDialog(time.Hours, time.Minutes);
@@ -99,7 +148,17 @@ void ShowPickerDialog()
 		// to be lost). Not useful until we have orientation changed events.
 		void ShowPickerDialog(int hour, int minute)
 		{
-			_dialog = CreateTimePickerDialog(hour, minute);
+			if (_dialog is null)
+			{
+				_dialog = CreateTimePickerDialog(hour, minute);
+			}
+			else
+			{
+				// Update the dialog with new values (for orientation changes)
+				_dialog.Dispose();
+				_dialog = CreateTimePickerDialog(hour, minute);
+			}
+
 			_dialog.Show();
 		}
 
@@ -112,5 +171,18 @@ void HidePickerDialog()
 
 		bool Use24HourView => VirtualView != null && (DateFormat.Is24HourFormat(PlatformView?.Context)
 			&& VirtualView.Format == "t" || VirtualView.Format == "HH:mm");
+
+		void OnMainDisplayInfoChanged(object? sender, DisplayInfoChangedEventArgs e)
+		{
+			TimePickerDialog? currentDialog = _dialog;
+
+			if (currentDialog is not null && currentDialog.IsShowing)
+			{
+				currentDialog.Dismiss();
+
+				// Recreate dialog with stored current values to handle orientation change
+				ShowPickerDialog(_currentHour, _currentMinute);
+			}
+		}
 	}
 }

src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt

@@ -3,6 +3,7 @@
 *REMOVED*Microsoft.Maui.Platform.MauiPicker.ShowPopupOnFocus.set -> void
 *REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnFocusChanged(bool gainFocus, Android.Views.FocusSearchDirection direction, Android.Graphics.Rect? previouslyFocusedRect) -> void
 *REMOVED*override Microsoft.Maui.Platform.MauiPicker.OnTouchEvent(Android.Views.MotionEvent? e) -> bool
+override Microsoft.Maui.Handlers.TimePickerHandler.ConnectHandler(Microsoft.Maui.Platform.MauiTimePicker! platformView) -> void
 override Microsoft.Maui.Platform.MauiDatePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
 override Microsoft.Maui.Platform.MauiPickerBase.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?
 override Microsoft.Maui.Platform.MauiTimePicker.DefaultMovementMethod.get -> Android.Text.Method.IMovementMethod?