Merge "Conform the logic to decide wallpaper darkness" into udc-dev am: 223a0a2202

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23617998

Change-Id: I700442ccc6330e1c932d58ddfa61c680912e1724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
George Lin
2023-06-12 13:46:57 +00:00
committed by Automerger Merge Worker

View File

@@ -404,8 +404,7 @@ constructor(
val darkClockColor = wallpaperColorScheme?.accent2?.s600
/** Note that when [wallpaperColors] is null, isWallpaperDark is true. */
val isWallpaperDark: Boolean =
(wallpaperColors?.colorHints?.and(WallpaperColors.HINT_SUPPORTS_DARK_TEXT)) !=
WallpaperColors.HINT_SUPPORTS_DARK_TEXT
(wallpaperColors?.colorHints?.and(WallpaperColors.HINT_SUPPORTS_DARK_TEXT)) == 0
clock.events.onSeedColorChanged(
if (isWallpaperDark) lightClockColor else darkClockColor
)