Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef65b63e authored by George Lin's avatar George Lin Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I937ca08059ee2e6f946c6d026b7daf5fa4263152
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a056ef7 223a0a22

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

+1 −2
Original line number Diff line number Diff line
@@ -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

            )