diff options
author | Brian Attwell <brianattwell@google.com> | 2014-08-21 21:55:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 21:55:11 +0000 |
commit | c5de306b25570a482186878d8c06a3e9564c5432 (patch) | |
tree | bc211cb3de6db81d298d342804d2d21349bc2576 | |
parent | 465a4df56560988c06f9c16b62b2622915e476d4 (diff) | |
parent | 53a942f1006fef9b032c01f5d149cc768bd6a9e8 (diff) |
am 53a942f1: am 2b678e12: am 5e18b45f: Merge "Change default alert dialog theme\'s accentColor" into lmp-dev
* commit '53a942f1006fef9b032c01f5d149cc768bd6a9e8':
Change default alert dialog theme's accentColor
-rw-r--r-- | res/values/styles.xml | 7 |
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> |