summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Sapperstein <asapperstein@google.com> 2016-06-24 18:31:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-24 18:31:43 +0000
commit411b9c69a17277e441f5b337e8d33c20b48e9444 (patch)
treec4904ea5aa099b187c0f4c5c550dbcdfdb625632
parent3d29644f28e2f7a3304b464c43e8d617312da0a3 (diff)
parent57e27851293164c277f401ab3f369c64c54a65ee (diff)
Merge "Add DeviceDefault style used by ringtone picker." into nyc-mr1-dev
-rw-r--r--core/res/res/values/themes_device_defaults.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 5c9402fd1267..dd0dac684521 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -745,6 +745,14 @@ easier.
<item name="colorAccent">@color/accent_device_default_dark</item>
</style>
+ <style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.Material.Settings.Dialog">
+ <!-- Color palette -->
+ <item name="colorPrimary">@color/primary_device_default_settings</item>
+ <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
+ <item name="colorSecondary">@color/secondary_device_default_settings</item>
+ <item name="colorAccent">@color/accent_device_default_light</item>
+ </style>
+
<style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="Theme.Material.Settings.DialogWhenLarge">
<!-- Color palette -->
<item name="colorPrimary">@color/primary_device_default_settings</item>