Snap for 12658558 from 220c6fef98fc47ffcea26c32b7292b5ecaaa0a25 to 25Q1-release
Change-Id: I55e359359d6e97863c613092bf0b7f77fdf36cd8
diff --git a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
index 72b0f19..73ebb0f 100644
--- a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
@@ -79,7 +79,10 @@
override fun getSmallView(clockId: String): View {
assert(!Flags.newCustomizationPickerUi())
val smallClockFrame =
- smallClockFrames[clockId]
+ smallClockFrames[clockId]?.apply {
+ (layoutParams as FrameLayout.LayoutParams).topMargin = getSmallClockTopMargin()
+ (layoutParams as FrameLayout.LayoutParams).marginStart = getSmallClockStartPadding()
+ }
?: createSmallClockFrame().also {
it.addView(getController(clockId).smallClock.view)
smallClockFrames[clockId] = it
@@ -114,7 +117,10 @@
private fun getSmallClockStartPadding() =
appContext.resources.getDimensionPixelSize(
com.android.systemui.customization.R.dimen.clock_padding_start
- )
+ ) +
+ appContext.resources.getDimensionPixelSize(
+ com.android.systemui.customization.R.dimen.status_view_margin_horizontal
+ )
override fun updateColorForAllClocks(@ColorInt seedColor: Int?) {
clockControllers.values.forEach {
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) {
diff --git a/tests/robotests/src/com/android/customization/picker/mode/ui/viewmodel/DarkModeViewModelTest.kt b/tests/robotests/src/com/android/customization/picker/mode/ui/viewmodel/DarkModeViewModelTest.kt
index 4078803..fbd56bc 100644
--- a/tests/robotests/src/com/android/customization/picker/mode/ui/viewmodel/DarkModeViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/picker/mode/ui/viewmodel/DarkModeViewModelTest.kt
@@ -91,16 +91,19 @@
testScope.runTest {
uiModeManager.setNightModeActivated(false)
darkModeRepository.refreshIsDarkModeActivated()
+ val getOverridingIsDarkMode = collectLastValue(darkModeViewModel.overridingIsDarkMode)
val getPreviewingIsDarkMode = collectLastValue(darkModeViewModel.previewingIsDarkMode)
val getToggleDarkMode = collectLastValue(darkModeViewModel.toggleDarkMode)
assertThat(getPreviewingIsDarkMode()).isFalse()
getToggleDarkMode()?.invoke()
+ assertThat(getOverridingIsDarkMode()).isTrue()
assertThat(getPreviewingIsDarkMode()).isTrue()
getToggleDarkMode()?.invoke()
+ assertThat(getOverridingIsDarkMode()).isNull()
assertThat(getPreviewingIsDarkMode()).isFalse()
}
}