Handle back navigation on clock font customization
Test: Manually tested that back gesture goes back to clock style
Bug: 350718184
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: Ie0807b527103acfbe031f477c022760b6552ba54
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
index 54ae132..0937315 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
@@ -62,6 +62,16 @@
override val selectedOption = defaultCustomizationOptionsViewModel.selectedOption
override fun handleBackPressed(): Boolean {
+
+ if (
+ defaultCustomizationOptionsViewModel.selectedOption.value ==
+ ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.CLOCK &&
+ clockPickerViewModel.selectedTab.value == ClockPickerViewModel.Tab.FONT
+ ) {
+ clockPickerViewModel.cancelFontAxes()
+ return true
+ }
+
val isBackPressedHandled = defaultCustomizationOptionsViewModel.handleBackPressed()
if (isBackPressedHandled) {