summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/util
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2019-05-13 23:23:05 -0700
committerHyunyoung Song <hyunyoungs@google.com>2019-05-14 10:15:11 -0700
commite751d90c449b388266f8ccf637e090a44b4f31cd (patch)
tree511fba9ff08ed9c1f7f732e6ce5db503edb651eb /src/com/android/launcher3/util
parentc857ad80491450eab30866f9c3f4b2c090776bea (diff)
downloadandroid_packages_apps_Trebuchet-e751d90c449b388266f8ccf637e090a44b4f31cd.tar.gz
android_packages_apps_Trebuchet-e751d90c449b388266f8ccf637e090a44b4f31cd.tar.bz2
android_packages_apps_Trebuchet-e751d90c449b388266f8ccf637e090a44b4f31cd.zip
Implement 3 shades of folder icon/container fill color
Bug: 130451254 Change-Id: I36d885a2b0247f1bb84cb98073459853ae723331
Diffstat (limited to 'src/com/android/launcher3/util')
-rw-r--r--src/com/android/launcher3/util/Themes.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java
index 0c4401232..0d0271569 100644
--- a/src/com/android/launcher3/util/Themes.java
+++ b/src/com/android/launcher3/util/Themes.java
@@ -48,10 +48,12 @@ public class Themes {
if (darkTheme) {
return wallpaperColorInfo.supportsDarkText() ?
- R.style.AppTheme_Dark_DarkText : R.style.AppTheme_Dark;
+ R.style.AppTheme_Dark_DarkText : wallpaperColorInfo.isMainColorDark() ?
+ R.style.AppTheme_Dark_DarkMainColor : R.style.AppTheme_Dark;
} else {
return wallpaperColorInfo.supportsDarkText() ?
- R.style.AppTheme_DarkText : R.style.AppTheme;
+ R.style.AppTheme_DarkText : wallpaperColorInfo.isMainColorDark() ?
+ R.style.AppTheme_DarkMainColor : R.style.AppTheme;
}
}