Fix small clock start padding is wrong in picker carousel in unfold portrait mode
Flag: NONE bugfix
Bug: 361494774
Test: manual test fold, unfold landscape and portrait, for small clock,
observe the left of small clock is aligned with smartspace.
Change-Id: Ibe435fb4e373f860985f241d35fd102987107d23
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 {