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

Commit 3bf72c8c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use static color for shade header text elements" into main

parents 6fbd5e73 99d7d528

packages/SystemUI/res-keyguard/layout/shade_carrier_new.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:textAppearance="@style/TextAppearance.QS.Status.Carriers"

        android:textAppearance="@style/TextAppearance.QS.Status"

        android:layout_marginEnd="@dimen/qs_carrier_margin_width"

        android:visibility="gone"

        android:textDirection="locale"

packages/SystemUI/res/layout/shade_carrier.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:textAppearance="@style/TextAppearance.QS.Status.Carriers"

        android:textAppearance="@style/TextAppearance.QS.Status"

        android:textDirection="locale"

        android:marqueeRepeatLimit="marquee_forever"

        android:singleLine="true"

packages/SystemUI/res/layout/shade_carrier_group.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:minWidth="48dp"

        android:minHeight="48dp"

        android:gravity="center_vertical"

        android:textAppearance="@style/TextAppearance.QS.Status.Carriers.NoCarrierText"

        android:textAppearance="@style/TextAppearance.QS.Status"

        android:textDirection="locale"

        android:marqueeRepeatLimit="marquee_forever"

        android:singleLine="true"

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    <color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->

    <color name="qs_detail_button_white">#B3FFFFFF</color><!-- 70% white -->

    <color name="status_bar_clock_color">#FFFFFFFF</color>

    <color name="shade_header_text_color">#FFFFFFFF</color>

    <color name="qs_tile_disabled_color">#9E9E9E</color> <!-- 38% black -->

    <color name="status_bar_icons_hover_color_light">#38FFFFFF</color> <!-- 22% white -->

    <color name="status_bar_icons_hover_color_dark">#38000000</color> <!-- 22% black -->

packages/SystemUI/res/values/styles.xml

+1 −7
Original line number Diff line number Diff line
@@ -176,17 +176,11 @@ 


    <style name="TextAppearance.QS.Status">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textColor">?attr/onSurface</item>

        <item name="android:textColor">@color/shade_header_text_color</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01</item>

    </style>



    <style name="TextAppearance.QS.Status.Carriers" />



    <style name="TextAppearance.QS.Status.Carriers.NoCarrierText">

        <item name="android:textColor">?attr/onSurfaceVariant</item>

    </style>



    <style name="TextAppearance.QS.Status.Build">

        <item name="android:textColor">?attr/onSurfaceVariant</item>

    </style>