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

Commit e7bb2108 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change font in QS to Google Sans"

parents c826047f e0abce03

packages/SystemUI/res/layout/qs_footer_impl.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
                android:layout_weight="1"

                android:layout_marginEnd="32dp"

                android:ellipsize="marquee"

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

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

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

                android:textDirection="locale"

                android:singleLine="true" />

packages/SystemUI/res/layout/qs_tile_label.xml

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

        android:visibility="gone"

        android:gravity="center"

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

        android:textAppearance="@style/TextAppearance.QS.TileLabel.Secondary"

        android:textColor="?android:attr/textColorSecondary"/>



    <View

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ 
    <dimen name="qs_page_indicator_height">8dp</dimen>

    <dimen name="qs_tile_icon_size">24dp</dimen>

    <dimen name="qs_tile_text_size">12sp</dimen>

    <dimen name="qs_carrier_info_text_size">14sp</dimen>

    <dimen name="qs_tile_divider_height">1dp</dimen>

    <dimen name="qs_panel_padding">16dp</dimen>

    <dimen name="qs_dual_tile_height">112dp</dimen>

packages/SystemUI/res/values/styles.xml

+12 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 


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

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

        <item name="android:fontFamily">sans-serif-medium</item>

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

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

    </style>
@@ -135,7 +135,7 @@ 


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

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

        <item name="android:fontFamily">sans-serif-medium</item>

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

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

        <item name="android:textStyle">normal</item>

    </style>
@@ -239,10 +239,20 @@ 
    </style>



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

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

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

    </style>



    <style name="TextAppearance.QS.TileLabel.Secondary">

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

        <item name="android:fontFamily">sans-serif</item>

    </style>



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

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

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

    </style>



    <style name="BaseBrightnessDialogContainer" parent="@style/Theme.SystemUI">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>