Merge "Fix Transit clock showing wrong color in multi-crop preview" into main (fb35a600) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt

+8 −1

Original line number	Diff line number	Diff line
		@@ -621,7 +621,9 @@ constructor(
		}

		private suspend fun updateClockAppearance(clock: ClockController) {
		if (!MigrateClocksToBlueprint.isEnabled) {
		clockController.clock = clock
		}
		val colors = wallpaperColors
		if (clockRegistry.seedColor == null && colors != null) {
		// Seed color null means users do not override any color on the clock. The default
		@@ -639,6 +641,11 @@ constructor(
		if (isWallpaperDark) lightClockColor else darkClockColor
		)
		}
		// In clock preview, we should have a seed color for clock
		// before setting clock to clockEventController to avoid updateColor with seedColor == null
		if (MigrateClocksToBlueprint.isEnabled) {
		clockController.clock = clock
		}
		}
		private fun onClockChanged() {
		if (MigrateClocksToBlueprint.isEnabled) {