Merge \"Add new private theme for Dialer.\" into nyc-mr1-dev

am: 26a17dc894

Change-Id: I4cda0072968d46a4d99a6d84ff23a14747c09287
This commit is contained in:
Andrew Sapperstein
2016-06-27 20:06:46 +00:00
committed by android-build-merger

View File

@@ -745,6 +745,15 @@ easier.
<item name="colorAccent">@color/accent_device_default_dark</item>
</style>
<!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
<style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="Theme.Material.NoActionBar">
<!-- 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_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>