Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev

am: 2233ba3eb5

Change-Id: I578a447f88ee09da77f4974bce1a23e2c93ed40f
This commit is contained in:
Andrew Sapperstein
2017-04-28 20:06:21 +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