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

Commit e88ceefb authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Update shade header fonts" into main

parents a052b1a2 53c9b169

packages/SystemUI/res/layout/combined_qs_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ frame when animating QS <-> QQS transition 
        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"

        android:singleLine="true"

        android:textDirection="locale"

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

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

        android:fontFeatureSettings="tnum"

        android:transformPivotX="0dp"

        android:transformPivotY="24dp"

packages/SystemUI/res/values/styles.xml

+7 −3
Original line number Diff line number Diff line
@@ -181,15 +181,19 @@ 
        <item name="android:textColor">@androidprv:color/materialColorOnSurfaceVariant</item>

    </style>



    <!-- This is hard coded to be sans-serif-condensed to match the icons -->



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

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

        <item name="android:fontFamily" android:featureFlag="!com.android.systemui.shade_header_font_update">@*android:string/config_headlineFontFamily</item>

        <item name="android:fontFamily" android:featureFlag="com.android.systemui.shade_header_font_update">variable-body-medium-emphasized</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.Clock">

        <item name="android:fontFamily" android:featureFlag="!com.android.systemui.shade_header_font_update">@*android:string/config_headlineFontFamily</item>

        <item name="android:fontFamily" android:featureFlag="com.android.systemui.shade_header_font_update">variable-display-small-emphasized</item>

    </style>



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

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

    </style>