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

Commit 51135091 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: 4f7f216c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23618530



Change-Id: Ibd43b598b5c76ee93c72170a263776b1000ab727
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f010d556 4f7f216c

src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -119,8 +119,7 @@ class ClockViewFactory( 




    private fun isLockscreenWallpaperDark(): Boolean {

    private fun isLockscreenWallpaperDark(): Boolean {

        val colors = wallpaperManager.getWallpaperColors(WallpaperManager.FLAG_LOCK)

        val colors = wallpaperManager.getWallpaperColors(WallpaperManager.FLAG_LOCK)

        return (colors?.colorHints?.and(WallpaperColors.HINT_SUPPORTS_DARK_TEXT)) !=

        return (colors?.colorHints?.and(WallpaperColors.HINT_SUPPORTS_DARK_TEXT)) == 0

            WallpaperColors.HINT_SUPPORTS_DARK_TEXT

    }

    }





    fun updateTimeFormat(clockId: String) {

    fun updateTimeFormat(clockId: String) {