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

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

Merge "Fix color resolution on status bar"

parents d87e7c98 098188a9

packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:alpha="0.24" android:color="?android:attr/colorBackground" />

    <item android:alpha="0.24" android:color="@android:color/black" />

</selector>
 
 No newline at end of file

packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_fill.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:alpha="0.47" android:color="?android:attr/colorBackground" />

    <item android:alpha="0.47" android:color="@android:color/black" />

</selector>
 
 No newline at end of file

packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:alpha="0.3" android:color="?android:attr/colorForeground" />

    <item android:alpha="0.3" android:color="@android:color/white" />

</selector>
 
 No newline at end of file

packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_fill.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?android:attr/colorForeground" />

    <item android:color="@android:color/white" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/values/styles.xml

+4 −1
Original line number Diff line number Diff line
@@ -321,12 +321,15 @@ 
        <item name="*android:isLightTheme">false</item>

    </style>



    <style name="Theme.SystemUI.Light" parent="@*android:style/Theme.DeviceDefault.QuickSettings">

    <style name="Theme.SystemUI.Light">

        <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>

        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>

        <item name="android:colorError">@*android:color/error_color_material_light</item>

        <item name="android:colorControlHighlight">#40000000</item>

        <item name="passwordStyle">@style/PasswordTheme.Light</item>



        <!-- Needed for MediaRoute chooser dialog -->

        <item name="*android:isLightTheme">true</item>

    </style>



    <style name="LockPatternStyle">