summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-08-21 21:34:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-21 21:34:49 +0000
commit2b678e12e27fb6e13415f91f79ef7def478fa8ab (patch)
treea1f34e48d168bdcf7b4a2cdcdde22dcdefa45c19 /res
parent5aa445bcb2d4697a897ac56d37c2d5b941f29228 (diff)
parent5e18b45fe7ad6b3770b7b99c9e88833061e5fe28 (diff)
am 5e18b45f: Merge "Change default alert dialog theme\'s accentColor" into lmp-dev
* commit '5e18b45fe7ad6b3770b7b99c9e88833061e5fe28': Change default alert dialog theme's accentColor
Diffstat (limited to 'res')
-rw-r--r--res/values/styles.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3fb590a96..9d0fcd0ea 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,7 @@
<item name="android:windowContentOverlay">@null</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
<item name="android:overlapAnchor">true</item>
+ <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_section_header_height">32dip</item>
@@ -167,4 +168,10 @@
<item name="android:colorAccent">@color/dialtacts_theme_color</item>
<item name="android:textColorLink">@color/dialtacts_theme_color</item>
</style>
+
+ <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
+ since the Alert dialog is private. They are identical anyway. -->
+ <style name="AlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
+ <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+ </style>
</resources>