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

Commit 3eac9918 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix font family in QS" into sc-dev am: a6377c98 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14792593

Change-Id: I7e0b43944dd61acd122a38d23efa5dae9b9152bb
parents 5f62a995 a6377c98

packages/SystemUI/res/values/styles.xml

+7 −8
Original line number Diff line number Diff line
@@ -199,11 +199,11 @@ 
        <item name="android:textSize">@dimen/qs_tile_text_size</item>

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

        <item name="android:lineHeight">20sp</item>

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

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

    </style>



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

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

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

    </style>



    <style name="TextAppearance.QS.UserSwitcher">
@@ -223,7 +223,7 @@ 
    </style>



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

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

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

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

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

        <item name="android:letterSpacing">0.01</item>
@@ -231,20 +231,19 @@ 
    </style>



    <style name="TextAppearance.QS.SecurityFooter" parent="@style/TextAppearance.QS.Status">

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

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

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

    </style>



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

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

    </style>

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



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

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

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

    </style>



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

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

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

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

    </style>