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

Commit 22276007 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Small reorganization of text styles for status bar. 

Creates a new "TextAppearance.StatusBar.Default" style that has the new
fonts, and then has the clock text style extend from that default style.

This also updates the carrier text on keyguard to use the new fonts.

Bug: 393609116
Flag: com.android.systemui.status_bar_font_updates
Test: Verify fonts of clock, carrier text, and battery estimate
Change-Id: I46b2cc1b9e5a742d70edc29b0686cc325da1e232
parent a5fa5796

packages/SystemUI/res/layout/battery_percentage_view.xml

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

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

        android:textAppearance="@style/TextAppearance.StatusBar.Default"

        android:textColor="?android:attr/textColorPrimary"

        android:gravity="center_vertical|start"

        android:paddingStart="@dimen/battery_level_padding_start"

packages/SystemUI/res/layout/keyguard_status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
        android:gravity="center_vertical"

        android:ellipsize="marquee"

        android:textDirection="locale"

        android:textAppearance="@style/TextAppearance.StatusBar.Carrier"

        android:textAppearance="@style/TextAppearance.StatusBar.Default"

        android:textColor="?attr/wallpaperTextColorSecondary"

        android:singleLine="true"

        systemui:showMissingSim="true"

packages/SystemUI/res/layout/status_bar.xml

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

                        android:layout_height="@dimen/status_bar_system_icons_height"

                        android:layout_gravity="center_vertical"

                        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

                        android:textAppearance="@style/TextAppearance.StatusBar.Default.Clock"

                        android:singleLine="true"

                        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

                        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"

packages/SystemUI/res/layout/system_icons.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,6 @@ 
        android:clipChildren="false"

        android:paddingEnd="@dimen/status_bar_battery_end_padding"

        android:visibility="gone"

        systemui:textAppearance="@style/TextAppearance.StatusBar.Clock" />

        systemui:textAppearance="@style/TextAppearance.StatusBar.Default" />



</LinearLayout>

packages/SystemUI/res/values/styles.xml

+3 −6
Original line number Diff line number Diff line
@@ -17,18 +17,15 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">



    <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">

    <style name="TextAppearance.StatusBar.Default" parent="@*android:style/TextAppearance.StatusBar.Icon">

        <item name="android:textSize">@dimen/status_bar_clock_size</item>

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

        <item name="android:fontFamily" android:featureFlag="com.android.systemui.status_bar_font_updates">"variable-label-large-emphasized"</item>

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

        <item name="android:fontFeatureSettings">tnum</item>

    </style>



    <style name="TextAppearance.StatusBar.Carrier" parent="@*android:style/TextAppearance.StatusBar.Icon">

        <item name="android:textSize">@dimen/status_bar_clock_size</item>

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

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

    <style name="TextAppearance.StatusBar.Default.Clock">

        <item name="android:fontFeatureSettings">tnum</item>

    </style>



    <style name="TextAppearance.StatusBar.UserChip" parent="@*android:style/TextAppearance.StatusBar.Icon">