Merge \"Merge \\"Add new private theme for Dialer.\\" into nyc-mr1-dev am: 26a17dc894\" into nyc-mr1-dev-plus-aosp

am: 446e303ecf

Change-Id: I65fae3f2b096089d6595da3073e13615a19fbeec
This commit is contained in:
Andrew Sapperstein
2016-06-27 20:11: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>