diff options
author | Mario Bertschler <bmario@google.com> | 2017-06-08 17:45:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-08 17:45:56 +0000 |
commit | 9483c6f4edf38abb35ae6185abafdb02ea0104ba (patch) | |
tree | 674aafeafceeebe2733ac8a6035f87c3e0772d87 /src/com/android/launcher3/dynamicui/WallpaperColorInfo.java | |
parent | 4efee85b75651d416d0d55a3bf2e9a9b2cddf4f9 (diff) | |
parent | a69369450281376cb207be554199bb4895843eb2 (diff) | |
download | android_packages_apps_Trebuchet-9483c6f4edf38abb35ae6185abafdb02ea0104ba.tar.gz android_packages_apps_Trebuchet-9483c6f4edf38abb35ae6185abafdb02ea0104ba.tar.bz2 android_packages_apps_Trebuchet-9483c6f4edf38abb35ae6185abafdb02ea0104ba.zip |
Merge "Dark color on super light wallpaper support" into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/dynamicui/WallpaperColorInfo.java')
-rw-r--r-- | src/com/android/launcher3/dynamicui/WallpaperColorInfo.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java b/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java index ca85b6af1..7470118e6 100644 --- a/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java +++ b/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java @@ -33,6 +33,7 @@ public class WallpaperColorInfo implements WallpaperManagerCompat.OnColorsChange private int mMainColor; private int mSecondaryColor; private boolean mIsDark; + private boolean mSupportsDarkText; private OnThemeChangeListener mOnThemeChangeListener; private WallpaperColorInfo(Context context) { @@ -54,6 +55,10 @@ public class WallpaperColorInfo implements WallpaperManagerCompat.OnColorsChange return mIsDark; } + public boolean supportsDarkText() { + return mSupportsDarkText; + } + @Override public void onColorsChanged(WallpaperColorsCompat colors, int which) { if (which == FLAG_SYSTEM) { @@ -72,6 +77,7 @@ public class WallpaperColorInfo implements WallpaperManagerCompat.OnColorsChange mMainColor = FALLBACK_COLOR; mSecondaryColor = FALLBACK_COLOR; } + mSupportsDarkText = wallpaperColors != null ? wallpaperColors.supportsDarkText() : false; float[] hsl = new float[3]; ColorUtils.colorToHSL(mMainColor, hsl); mIsDark = hsl[2] < 0.2f; |