diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-25 21:13:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 21:13:29 +0000 |
| commit | f7ce0125a309d35d81d1b9f34fcca592db199d58 (patch) | |
| tree | 81d8f48838839cc6d1f07e78661b25b94a6b0536 /packages/SystemUI/res | |
| parent | c1d102af3ee4f8de24a53853107506f87f8f5b36 (diff) | |
| parent | d27b22ede989330844993df98b3add2ca9eb2af6 (diff) | |
| download | frameworks_base-f7ce0125a309d35d81d1b9f34fcca592db199d58.zip frameworks_base-f7ce0125a309d35d81d1b9f34fcca592db199d58.tar.gz frameworks_base-f7ce0125a309d35d81d1b9f34fcca592db199d58.tar.bz2 | |
am 4a65634b: am 08e7eb03: am ec2b8cb3: Merge "Volume: Show safe media warning in settings." into lmp-dev
* commit '4a65634b3638e1b324ee8899785ab0e86a36778c':
Volume: Show safe media warning in settings.
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 0b8f876..61e6121 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -249,6 +249,11 @@ <item name="android:colorControlActivated">@color/system_accent_color</item> </style> + <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog"> + <item name="android:colorPrimary">@color/system_primary_color</item> + <item name="android:colorControlActivated">@color/system_accent_color</item> + </style> + <style name="NotificationsQuickSettings"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> @@ -275,7 +280,4 @@ <item name="android:textStyle">italic</item> <item name="android:textColor">#60000000</item> </style> - - <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog"> - </style> </resources> |