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

Commit be46fe68 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Conform the logic to decide wallpaper darkness" into udc-dev am: 223a0a22 am: a172c094"
parents d778e87e 1d8e223b

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

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

            )

            )