diff options
| author | 2023-06-12 14:28:42 +0000 | |
|---|---|---|
| committer | 2023-06-12 14:28:42 +0000 | |
| commit | 1d6161ad29d3016c7a537a4b2788b73952ff8cf2 (patch) | |
| tree | 8f125047bf6825b067183c419a5f6ea947994b80 | |
| parent | 6d65e1e3b2daecedec5f1dabed12c48b2af18a8e (diff) | |
| parent | ef65b63e8f84e874e920d6f47bced71aef430dc6 (diff) | |
Merge "Conform the logic to decide wallpaper darkness" into udc-dev am: 223a0a2202 am: ef65b63e8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23617998
Change-Id: Id6102f8f52c6b92bd802af859ec321138fcd795e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt index db231092d7a5..1c2e85b0fd3a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt @@ -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 ) |