Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove clock shadows from light mode" into qt-dev

Browse Source 
am: 88932c42c4

Change-Id: I7207e7629b4a46e4b7d12f92b0ac6cb338fdd134
This commit is contained in:
Lucas Dupin
2019-05-24 17:25:39 -07:00
committed by android-build-merger
parent e496882e8f 88932c42c4
commit 171de819aa
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/res-keyguard/values/styles.xml
View File

@@ -66,7 +66,7 @@
<item name="android:fontFeatureSettings">@*android:string/config_headlineFontFeatureSettings</item> <item name="android:fontFeatureSettings">@*android:string/config_headlineFontFeatureSettings</item>
<item name="android:ellipsize">none</item> <item name="android:ellipsize">none</item>
<item name="android:shadowColor">@color/keyguard_shadow_color</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>
<style name="widget_title_bold"> <style name="widget_title_bold">
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
@@ -75,7 +75,7 @@
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:ellipsize">none</item> <item name="android:ellipsize">none</item>
<item name="android:shadowColor">@color/keyguard_shadow_color</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>
<style name="widget_small_bold"> <style name="widget_small_bold">
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
@@ -84,7 +84,7 @@
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:ellipsize">none</item> <item name="android:ellipsize">none</item>
<item name="android:shadowColor">@color/keyguard_shadow_color</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>
<style name="BouncerSecurityContainer"> <style name="BouncerSecurityContainer">
@@ -115,7 +115,7 @@
<item name="android:maxLines">2</item> <item name="android:maxLines">2</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:shadowColor">@color/keyguard_shadow_color</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>
<style name="TextAppearance.Keyguard.Secondary"> <style name="TextAppearance.Keyguard.Secondary">
@@ -130,7 +130,7 @@
<item name="android:maxLines">1</item> <item name="android:maxLines">1</item>
<item name="android:textColor">?attr/wallpaperTextColor</item> <item name="android:textColor">?attr/wallpaperTextColor</item>
<item name="android:shadowColor">@color/keyguard_shadow_color</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>
</resources> </resources>

3
packages/SystemUI/res/values/attrs.xml
View File

@@ -140,6 +140,9 @@
<!-- Used to style charging animation AVD animation --> <!-- Used to style charging animation AVD animation -->
<attr name="chargingAnimColor" format="color" /> <attr name="chargingAnimColor" format="color" />
<!-- Size of shadows/elevations on keyguard -->
<attr name="shadowRadius" format="float" />
<!-- Used display CarrierText in Keyguard or QS Footer --> <!-- Used display CarrierText in Keyguard or QS Footer -->
<declare-styleable name="CarrierText"> <declare-styleable name="CarrierText">
<attr name="allCaps" format="boolean" /> <attr name="allCaps" format="boolean" />

2
packages/SystemUI/res/values/styles.xml
View File

@@ -286,6 +286,7 @@
<item name="passwordStyle">@style/PasswordTheme</item> <item name="passwordStyle">@style/PasswordTheme</item>
<item name="backgroundProtectedStyle">@style/BackgroundProtectedStyle</item> <item name="backgroundProtectedStyle">@style/BackgroundProtectedStyle</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item> <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
<item name="shadowRadius">@dimen/keyguard_shadow_radius</item>
<!-- Needed for MediaRoute chooser dialog --> <!-- Needed for MediaRoute chooser dialog -->
<item name="*android:isLightTheme">false</item> <item name="*android:isLightTheme">false</item>
@@ -297,6 +298,7 @@
<item name="android:colorError">@*android:color/error_color_material_light</item> <item name="android:colorError">@*android:color/error_color_material_light</item>
<item name="android:colorControlHighlight">#40000000</item> <item name="android:colorControlHighlight">#40000000</item>
<item name="passwordStyle">@style/PasswordTheme.Light</item> <item name="passwordStyle">@style/PasswordTheme.Light</item>
<item name="shadowRadius">0</item>
<!-- Needed for MediaRoute chooser dialog --> <!-- Needed for MediaRoute chooser dialog -->
<item name="*android:isLightTheme">true</item> <item name="*android:isLightTheme">true</item>