summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Sapperstein <asapperstein@google.com> 2016-06-24 18:42:12 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-24 18:42:12 +0000
commit9a2c4f867cab9e595ddf2e342f82fcd65beba4e3 (patch)
treeeb45b6ec5a789b4e949a0560f9c4d94e2719b5d5
parent16f3293e1af7a3a72e03c6759f1ad3fe8f7e1939 (diff)
parent411b9c69a17277e441f5b337e8d33c20b48e9444 (diff)
Merge \"Add DeviceDefault style used by ringtone picker.\" into nyc-mr1-dev
am: 411b9c69a1 Change-Id: I8742ff9342285bfb72f7f8cf68226a0d46d6d880
-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>