Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev am: 2233ba3eb5

am: 93aee3993b

Change-Id: Ied1782027bb1a922f6c2dfc1bba972b57ed68695
This commit is contained in:
Andrew Sapperstein
2017-04-28 20:13:00 +00:00
committed by android-build-merger

View File

@@ -744,6 +744,7 @@ easier.
<item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>
<item name="colorSecondary">@color/secondary_device_default_settings_light</item>
<item name="colorAccent">@color/accent_device_default_light</item>
<item name="colorEdgeEffect">@android:color/black</item>
</style>
<!-- @hide DeviceDefault theme for a window that should use Settings theme colors