Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88932c42 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

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

parents 7ede5268 fc0cf155

packages/SystemUI/res-keyguard/values/styles.xml

+5 −5
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -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" />

packages/SystemUI/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>