diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2018-05-24 13:49:57 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2018-05-24 13:50:27 -0700 |
| commit | a6afdffbbd261e54a5eaeb7bc2d6a5a0d1b5f91a (patch) | |
| tree | 7da8e90a94d15ad348d036e02b43f88b42d0a4c4 /src/com/android/launcher3/BaseDraggingActivity.java | |
| parent | db28a992a9eb52f02f565f0185d4a30ee8fed24e (diff) | |
| download | android_packages_apps_Trebuchet-a6afdffbbd261e54a5eaeb7bc2d6a5a0d1b5f91a.tar.gz android_packages_apps_Trebuchet-a6afdffbbd261e54a5eaeb7bc2d6a5a0d1b5f91a.tar.bz2 android_packages_apps_Trebuchet-a6afdffbbd261e54a5eaeb7bc2d6a5a0d1b5f91a.zip | |
Adding support for dark text on dark theme
Bug: 80253867
Change-Id: Ib81a2fe884f68cd2dd4af1e573bd8c836f374f16
Diffstat (limited to 'src/com/android/launcher3/BaseDraggingActivity.java')
| -rw-r--r-- | src/com/android/launcher3/BaseDraggingActivity.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index d9e7d2033..8af9acc24 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -90,11 +90,11 @@ public abstract class BaseDraggingActivity extends BaseActivity 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; } } |