summaryrefslogtreecommitdiffstats
path: root/res/values/styles.xml
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-02-07 13:11:17 -0800
committerSunny Goyal <sunnygoyal@google.com>2017-02-09 10:16:22 -0800
commitd5d5e22715c19c361d264693929c15c4325e80fa (patch)
treede664e7f61c2088de817483d57860a83a1f87228 /res/values/styles.xml
parentdb7b82960a54b85510aaeba2f543b37b4dc59fc8 (diff)
downloadandroid_packages_apps_Trebuchet-d5d5e22715c19c361d264693929c15c4325e80fa.tar.gz
android_packages_apps_Trebuchet-d5d5e22715c19c361d264693929c15c4325e80fa.tar.bz2
android_packages_apps_Trebuchet-d5d5e22715c19c361d264693929c15c4325e80fa.zip
Updating widget tray theme
Using standard theme attributes rather than custom color codes, so that it plays nice with system theme changes. Bug: 34819119 Bug: 34897402 Bug: 21446746 Change-Id: I265fba3ceae8873650fd09e4704838d313155e83
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r--res/values/styles.xml12
1 files changed, 4 insertions, 8 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8ffc53fd7..879c7d8d6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -46,20 +46,16 @@
<!-- 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>
+ <item name="android:colorEdgeEffect">@color/workspace_edge_effect_color</item>
+ <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item>
+ <item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>
</style>
<!-- Overscroll effect -->
- <style name="CustomOverscroll" />
-
- <style name="CustomOverscroll.Light" parent="@android:style/Theme.DeviceDefault.Light">
+ <style name="AllAppsOverscroll" parent="@android:style/Theme.DeviceDefault.Light">
<item name="android:colorEdgeEffect">@color/folder_edge_effect_color</item>
</style>
- <style name="CustomOverscroll.Dark">
- <item name="android:colorEdgeEffect">@color/workspace_edge_effect_color</item>
- </style>
-
<!-- Different icons -->
<style name="Icon">
<item name="android:layout_width">match_parent</item>