summaryrefslogtreecommitdiffstats
path: root/res/values/styles.xml
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2016-07-01 03:11:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-01 03:11:20 +0000
commit3da982fbabd5027bb4f927ff66a8ec336722a3af (patch)
tree0efb22121a9c8667acb72c3f967b03a7bb6770f2 /res/values/styles.xml
parent5a2af756ea9ca3e557978021c7c4b75f79d50d9e (diff)
parent5f7750d75c83b13facf57988e1f042ce8af9abd6 (diff)
downloadandroid_packages_apps_Trebuchet-3da982fbabd5027bb4f927ff66a8ec336722a3af.tar.gz
android_packages_apps_Trebuchet-3da982fbabd5027bb4f927ff66a8ec336722a3af.tar.bz2
android_packages_apps_Trebuchet-3da982fbabd5027bb4f927ff66a8ec336722a3af.zip
Merge "Use colorSecondary for darker bg color." into ub-launcher3-calgary
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r--res/values/styles.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a1ba0b0b5..3e827a643 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,12 +30,19 @@
<style name="Theme" parent="@style/LauncherTheme"></style>
+ <!-- Theme for the widget container. Overridden on API 25. -->
+ <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+ <item name="colorSecondary">@color/fallback_secondary_color</item>
+ </style>
+
<!-- Overscroll effect -->
+ <style name="CustomOverscroll" />
+
<style name="CustomOverscroll.Light" parent="@android:style/Theme.DeviceDefault.Light">
<item name="android:colorEdgeEffect">@color/folder_edge_effect_color</item>
</style>
- <style name="CustomOverscroll.Dark" parent="@android:style/Theme.DeviceDefault">
+ <style name="CustomOverscroll.Dark">
<item name="android:colorEdgeEffect">@color/workspace_edge_effect_color</item>
</style>