Merge \"Add new DeviceDefault.Light.Voice theme.\" into nyc-mr1-dev

am: d7a59636b7

Change-Id: Ib920e93d640f616e44e2288f63ce18d817abaec0
This commit is contained in:
Andrew Sapperstein
2016-07-19 21:52:34 +00:00
committed by android-build-merger

View File

@@ -724,6 +724,12 @@ easier.
<item name="colorAccent">@color/accent_device_default_light</item>
</style>
<style name="Theme.DeviceDefault.Light.Voice" parent="Theme.Material.Light.Voice">
<!-- Color palette -->
<item name="colorPrimary">@color/primary_device_default_light</item>
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
<item name="colorAccent">@color/accent_device_default_light</item>
</style>
<!-- DeviceDefault theme for a window that should look like the Settings app. -->
<style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings">