commit 8789d4bb6f80a7c5b2e86e83f162d6fb78f05276
author Andrew Sapperstein <asapperstein@google.com> Fri Apr 28 20:13:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 20:13:00 2017 +0000
tree a6791ee09763036aa0b8229bd02d0ee97db8f46d
parent 99a50dfb5c68c001b3eb2e7721e16fc2370daf74
parent 93aee3993bf07d571fa7d0699b9d8391edc95f9c

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

Change-Id: Ied1782027bb1a922f6c2dfc1bba972b57ed68695

core/res/res/values/themes_device_defaults.xml

diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index d80ff1d..7517946 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -744,6 +744,7 @@
         <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