diff options
author | Tony Wickham <twickham@google.com> | 2017-06-26 21:34:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-26 21:34:59 +0000 |
commit | 7a0ec3f28c4e055a4be7a46fbf46f5f3f5019040 (patch) | |
tree | 1ebb9da6ae2ab0d14a40cc4a1ef36ecc4c0a0388 /res/values | |
parent | 3ed30765502f45cc0e922954840ef11f474e3c8b (diff) | |
parent | 093c3ac7c3e265bda0b9dbd29138ced28126e14e (diff) | |
download | android_packages_apps_Trebuchet-7a0ec3f28c4e055a4be7a46fbf46f5f3f5019040.tar.gz android_packages_apps_Trebuchet-7a0ec3f28c4e055a4be7a46fbf46f5f3f5019040.tar.bz2 android_packages_apps_Trebuchet-7a0ec3f28c4e055a4be7a46fbf46f5f3f5019040.zip |
Merge "Add dark widgets theme" into ub-launcher3-dorval-polish
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 7929e65d1..3839eb130 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -30,6 +30,7 @@ <attr name="workspaceAmbientShadowColor" format="color"/> <attr name="workspaceKeyShadowColor" format="color" /> <attr name="workspaceStatusBarScrim" format="reference" /> + <attr name="widgetsTheme" format="reference" /> <!-- BubbleTextView specific attributes. --> <declare-styleable name="BubbleTextView"> diff --git a/res/values/styles.xml b/res/values/styles.xml index 8943a4552..d11b00208 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -40,6 +40,7 @@ <item name="workspaceAmbientShadowColor">#33000000</item> <item name="workspaceKeyShadowColor">#44000000</item> <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item> + <item name="widgetsTheme">@style/WidgetContainerTheme</item> </style> <style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"></style> @@ -64,6 +65,7 @@ <item name="popupColorPrimary">?android:attr/colorPrimary</item> <item name="popupColorSecondary">#424242</item> <!-- Gray 800 --> <item name="popupColorTertiary">#757575</item> <!-- Gray 600 --> + <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item> <item name="isMainColorDark">true</item> </style> @@ -85,6 +87,8 @@ <item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item> </style> + <style name="WidgetContainerTheme.Dark" /> + <style name="FastScrollerPopup" > <item name="android:layout_width">wrap_content</item> <item name="android:minWidth">@dimen/fastscroll_popup_width</item> |