Merge "Add DeviceDefault style used by ringtone picker." into nyc-mr1-dev

This commit is contained in:
Andrew Sapperstein
2016-06-24 18:31:41 +00:00
committed by Android (Google) Code Review

View File

@@ -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>