diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2018-06-07 15:42:57 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2018-06-08 11:20:01 -0700 |
| commit | bd88f396dc812f7c90df74e79830fd1948225cfa (patch) | |
| tree | dd601d73573845372cf8375e443b2768515ddefe /res | |
| parent | 53d57998c17cf9f2ba48daa8a5f41f3a5eac514d (diff) | |
| download | android_packages_apps_Trebuchet-bd88f396dc812f7c90df74e79830fd1948225cfa.tar.gz android_packages_apps_Trebuchet-bd88f396dc812f7c90df74e79830fd1948225cfa.tar.bz2 android_packages_apps_Trebuchet-bd88f396dc812f7c90df74e79830fd1948225cfa.zip | |
Defining a base theme, which can be overriden by derivative projects without
affecting launcher theme
Bug: 70220582
Change-Id: Ie3069686be5e6a42910e90541db2d6b5b79e25c1
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-v26/styles.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/res/values-v26/styles.xml b/res/values-v26/styles.xml index b25f46a0c..e810ab251 100644 --- a/res/values-v26/styles.xml +++ b/res/values-v26/styles.xml @@ -21,7 +21,7 @@ <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings"> <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item> </style> - <style name="WidgetContainerTheme.Dark" parent="LauncherThemeDark"> + <style name="WidgetContainerTheme.Dark" parent="AppTheme.Dark"> <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item> <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 --> </style> diff --git a/res/values/styles.xml b/res/values/styles.xml index 31cbaa11a..0645f414f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -56,7 +56,7 @@ <item name="workspaceStatusBarScrim">@null</item> </style> - <style name="LauncherThemeDark" parent="@style/LauncherTheme"> + <style name="LauncherTheme.Dark" parent="@style/LauncherTheme"> <item name="android:textColorPrimary">#FFFFFFFF</item> <item name="android:textColorSecondary">#FFFFFFFF</item> <item name="android:textColorTertiary">#CCFFFFFF</item> @@ -73,7 +73,7 @@ <item name="isMainColorDark">true</item> </style> - <style name="LauncherThemeDark.DarKText" parent="@style/LauncherThemeDark"> + <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark"> <item name="allAppsInterimScrimAlpha">25</item> <item name="workspaceTextColor">#FF212121</item> <item name="workspaceShadowColor">@android:color/transparent</item> @@ -83,6 +83,13 @@ <item name="workspaceStatusBarScrim">@null</item> </style> + <!-- A derivative project can extend these themes to customize the application theme without + affecting the base theme --> + <style name="AppTheme" parent="@style/LauncherTheme" /> + <style name="AppTheme.DarkText" parent="@style/LauncherTheme.DarkText" /> + <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark" /> + <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" /> + <!-- 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 |