Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I937ca08059ee2e6f946c6d026b7daf5fa4263152
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:47:59 +00:00
committed by Automerger Merge Worker
parent 6a056ef7cf 223a0a2202
commit ef65b63e8f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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