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

Commit 2f046e13 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix styles in header." into sc-dev am: da0864ae 

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

Change-Id: I1dd9cc31d93543fdd375de41fdd1e65fc4871d11
parents 0f6dd344 da0864ae

packages/SystemUI/res/layout/qs_carrier_group.xml

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

        android:minHeight="48dp"

        android:gravity="center_vertical"

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

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

        android:textDirection="locale"

        android:marqueeRepeatLimit="marquee_forever"

        android:singleLine="true"

        android:maxEms="7"

        android:visibility="gone"/>



    <include

packages/SystemUI/res/layout/qs_footer_impl.xml

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
                android:focusable="true"

                android:gravity="center_vertical"

                android:singleLine="true"

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

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

                android:visibility="gone" />

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+5 −8
Original line number Diff line number Diff line
@@ -36,19 +36,16 @@ 
        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

        android:paddingEnd="@dimen/status_bar_left_clock_end_padding"

        android:singleLine="true"

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



    <View

        android:layout_height="match_parent"

        android:layout_width="0dp"

        android:layout_weight="1"

        />

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



    <include layout="@layout/qs_carrier_group"

        android:id="@+id/carrier_group"

        android:layout_width="wrap_content"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:minHeight="48dp"

        android:minWidth="48dp"

        android:layout_marginStart="8dp"

        android:layout_gravity="end|center_vertical"

        android:focusable="false"/>

packages/SystemUI/res/values/styles.xml

+11 −4
Original line number Diff line number Diff line
@@ -226,13 +226,21 @@ 
        <item name="android:textSize">@dimen/qs_tile_text_size</item>

    </style>



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

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

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

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

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

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

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

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

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

    </style>



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

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

    </style>



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

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

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

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

    </style>
@@ -389,7 +397,6 @@ 
    <style name="Theme.SystemUI.QuickSettings" parent="@*android:style/Theme.DeviceDefault">

        <item name="lightIconTheme">@style/QSIconTheme</item>

        <item name="darkIconTheme">@style/QSIconTheme</item>

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

        <item name="android:colorError">@*android:color/error_color_material_dark</item>

        <item name="android:windowIsFloating">true</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>