commit a6afdffbbd261e54a5eaeb7bc2d6a5a0d1b5f91a
author Sunny Goyal <sunnygoyal@google.com> Thu May 24 13:49:57 2018 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu May 24 13:50:27 2018 -0700
tree 7da8e90a94d15ad348d036e02b43f88b42d0a4c4
parent db28a992a9eb52f02f565f0185d4a30ee8fed24e

Adding support for dark text on dark theme

Bug: 80253867
Change-Id: Ib81a2fe884f68cd2dd4af1e573bd8c836f374f16

src/com/android/launcher3/BaseDraggingActivity.java

diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index d9e7d20..8af9acc 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -90,11 +90,11 @@
 
     protected int getThemeRes(WallpaperColorInfo wallpaperColorInfo) {
         if (wallpaperColorInfo.isDark()) {
-            return R.style.LauncherThemeDark;
-        } else if (wallpaperColorInfo.supportsDarkText()) {
-            return R.style.LauncherThemeDarkText;
+            return wallpaperColorInfo.supportsDarkText() ?
+                    R.style.LauncherThemeDark_DarKText : R.style.LauncherThemeDark;
         } else {
-            return R.style.LauncherTheme;
+            return wallpaperColorInfo.supportsDarkText() ?
+                    R.style.LauncherTheme_DarkText : R.style.LauncherTheme;
         }
     }