From fc0cf155b7759a6b289d7df19919aa39c39e9581 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Thu, 23 May 2019 16:14:29 -0700
Subject: [PATCH] Remove clock shadows from light mode

Test: manually change wallpaper from light to dark
Fixes: 133440761
Change-Id: I421e1af666047adce3841ba1fcdfa11a9a92d688
---
 packages/SystemUI/res-keyguard/values/styles.xml | 10 +++++-----
 packages/SystemUI/res/values/attrs.xml           |  3 +++
 packages/SystemUI/res/values/styles.xml          |  2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index 17923cdc41dff..bcdcb3b8f5753 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -66,7 +66,7 @@
         <item name="android:fontFeatureSettings">@*android:string/config_headlineFontFeatureSettings</item>
         <item name="android:ellipsize">none</item>
         <item name="android:shadowColor">@color/keyguard_shadow_color</item>
-        <item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
+        <item name="android:shadowRadius">?attr/shadowRadius</item>
     </style>
     <style name="widget_title_bold">
         <item name="android:textStyle">bold</item>
@@ -75,7 +75,7 @@
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:ellipsize">none</item>
         <item name="android:shadowColor">@color/keyguard_shadow_color</item>
-        <item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
+        <item name="android:shadowRadius">?attr/shadowRadius</item>
     </style>
     <style name="widget_small_bold">
         <item name="android:textStyle">bold</item>
@@ -84,7 +84,7 @@
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:ellipsize">none</item>
         <item name="android:shadowColor">@color/keyguard_shadow_color</item>
-        <item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
+        <item name="android:shadowRadius">?attr/shadowRadius</item>
     </style>
 
     <style name="BouncerSecurityContainer">
@@ -115,7 +115,7 @@
         <item name="android:maxLines">2</item>
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:shadowColor">@color/keyguard_shadow_color</item>
-        <item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
+        <item name="android:shadowRadius">?attr/shadowRadius</item>
     </style>
 
     <style name="TextAppearance.Keyguard.Secondary">
@@ -130,7 +130,7 @@
         <item name="android:maxLines">1</item>
         <item name="android:textColor">?attr/wallpaperTextColor</item>
         <item name="android:shadowColor">@color/keyguard_shadow_color</item>
-        <item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
+        <item name="android:shadowRadius">?attr/shadowRadius</item>
     </style>
 
 </resources>
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index 9b72e7a96cbf8..f124d89070bfe 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -140,6 +140,9 @@
     <!-- Used to style charging animation AVD animation -->
     <attr name="chargingAnimColor" format="color" />
 
+    <!-- Size of shadows/elevations on keyguard -->
+    <attr name="shadowRadius" format="float" />
+
     <!-- Used display CarrierText in Keyguard or QS Footer -->
     <declare-styleable name="CarrierText">
         <attr name="allCaps" format="boolean" />
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 04cd30cdb86ac..9861750a6dcbd 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -286,6 +286,7 @@
         <item name="passwordStyle">@style/PasswordTheme</item>
         <item name="backgroundProtectedStyle">@style/BackgroundProtectedStyle</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="shadowRadius">@dimen/keyguard_shadow_radius</item>
 
         <!-- Needed for MediaRoute chooser dialog -->
         <item name="*android:isLightTheme">false</item>
@@ -297,6 +298,7 @@
         <item name="android:colorError">@*android:color/error_color_material_light</item>
         <item name="android:colorControlHighlight">#40000000</item>
         <item name="passwordStyle">@style/PasswordTheme.Light</item>
+        <item name="shadowRadius">0</item>
 
         <!-- Needed for MediaRoute chooser dialog -->
         <item name="*android:isLightTheme">true</item>