From a8481976179bdb86a1bd48ab731de44b96b104a1 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Tue, 21 May 2019 11:47:47 +0800
Subject: [PATCH] Update Theme.DeviceDefault.Settings's colorEdgeEffect

Set Theme.DeviceDefault.Settings's colorEdgeEffect to white in the dark mode. The
framework adds 20% alpha to it.

Bug: 133105863
Test: visual
Change-Id: I5ab8429bc063e864d27042c5b074eb218f058d6b
---
 core/res/res/values-night/themes_device_defaults.xml | 1 +
 core/res/res/values/colors_device_defaults.xml       | 3 +++
 core/res/res/values/themes_device_defaults.xml       | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values-night/themes_device_defaults.xml b/core/res/res/values-night/themes_device_defaults.xml
index 051f7a03176f4..f595046ca1933 100644
--- a/core/res/res/values-night/themes_device_defaults.xml
+++ b/core/res/res/values-night/themes_device_defaults.xml
@@ -58,6 +58,7 @@ easier.
         <item name="colorPrimary">@color/primary_dark_device_default_settings</item>
         <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
         <item name="colorBackground">@color/primary_dark_device_default_settings</item>
+        <item name="colorEdgeEffect">@color/edge_effect_device_default_dark</item>
 
         <item name="colorListDivider">@color/list_divider_color_dark</item>
         <item name="opacityListDivider">@color/list_divider_opacity_device_default_dark</item>
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml
index c60b3996beb5a..6225896f6b984 100644
--- a/core/res/res/values/colors_device_defaults.xml
+++ b/core/res/res/values/colors_device_defaults.xml
@@ -54,4 +54,7 @@
     <color name="loading_gradient_background_color_light">#DADCE0</color>
     <color name="loading_gradient_highlight_color_dark">#3C4043</color>
     <color name="loading_gradient_highlight_color_light">#F1F3F4</color>
+
+    <color name="edge_effect_device_default_light">@android:color/black</color>
+    <color name="edge_effect_device_default_dark">@android:color/white</color>
 </resources>
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 2b9321c7afffe..f4ebbade5a854 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -1471,7 +1471,7 @@ easier.
         <item name="colorSecondary">@color/secondary_device_default_settings_light</item>
         <item name="colorAccent">@color/accent_device_default_light</item>
         <item name="colorError">@color/error_color_device_default_light</item>
-        <item name="colorEdgeEffect">@android:color/black</item>
+        <item name="colorEdgeEffect">@color/edge_effect_device_default_light</item>
 
         <!-- Add white nav bar with divider that matches material -->
         <item name="navigationBarDividerColor">@color/navigation_bar_divider_device_default_settings</item>