openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[automerger] Adding support for dark text on dark theme am: a6afdffbbd 

Change-Id: I7d83aa8d1e551ca00f397c20447164f4c43b3141
This commit is contained in:
Android Build Merger (Role) 2018-05-24 20:50:34 +00:00
parent 96a2ea917a a6afdffbbd
commit 11ee99186c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/styles.xml
View File

@ -45,7 +45,7 @@
<style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"></style>
<style name="LauncherThemeDarkText" parent="@style/LauncherTheme">
<style name="LauncherTheme.DarkText" parent="@style/LauncherTheme">
<item name="workspaceTextColor">#FF212121</item>
<item name="workspaceShadowColor">@android:color/transparent</item>
<item name="workspaceAmbientShadowColor">@android:color/transparent</item>
@ -70,6 +70,15 @@
<item name="isMainColorDark">true</item>
</style>
<style name="LauncherThemeDark.DarKText" parent="@style/LauncherThemeDark">
<item name="workspaceTextColor">#FF212121</item>
<item name="workspaceShadowColor">@android:color/transparent</item>
<item name="workspaceAmbientShadowColor">@android:color/transparent</item>
<item name="workspaceKeyShadowColor">@android:color/transparent</item>
<item name="isWorkspaceDarkText">true</item>
<item name="workspaceStatusBarScrim">@null</item>
</style>
<!--
Theme overrides to element on homescreen, i.e., which are drawn on top on wallpaper.
Various foreground colors are overridden to be workspaceTextColor so that they are properly

8
src/com/android/launcher3/BaseDraggingActivity.java
View File

@ -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;
}
}