diff options
| -rw-r--r-- | src/com/android/launcher3/compat/WallpaperColorsCompat.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/dynamicui/WallpaperColorInfo.java | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/compat/WallpaperColorsCompat.java b/src/com/android/launcher3/compat/WallpaperColorsCompat.java index 58d2a8028..e25b9d929 100644 --- a/src/com/android/launcher3/compat/WallpaperColorsCompat.java +++ b/src/com/android/launcher3/compat/WallpaperColorsCompat.java @@ -21,6 +21,7 @@ package com.android.launcher3.compat; public class WallpaperColorsCompat { public static final int HINT_SUPPORTS_DARK_TEXT = 0x1; + public static final int HINT_SUPPORTS_DARK_THEME = 0x2; private final int mPrimaryColor; private final int mSecondaryColor; diff --git a/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java b/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java index 512e89a41..80a89e37d 100644 --- a/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java +++ b/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java @@ -81,9 +81,9 @@ public class WallpaperColorInfo implements WallpaperManagerCompat.OnColorsChange mSupportsDarkText = wallpaperColors != null ? (wallpaperColors.getColorHints() & WallpaperColorsCompat.HINT_SUPPORTS_DARK_TEXT) > 0 : false; - float[] hsl = new float[3]; - ColorUtils.colorToHSL(mMainColor, hsl); - mIsDark = hsl[2] < 0.2f; + mIsDark = wallpaperColors != null + ? (wallpaperColors.getColorHints() + & WallpaperColorsCompat.HINT_SUPPORTS_DARK_THEME) > 0 : false; } public void setOnThemeChangeListener(OnThemeChangeListener onThemeChangeListener) { |