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

Commit 2bb6a82a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bring QS TextAppearance up to spec." into sc-dev am: 02a92fb4 

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

Change-Id: I0a589da8c6bdfe5906dab8468639f4d2b304c19b
parents d4afa821 02a92fb4

packages/SystemUI/res/layout/qs_carrier.xml

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

        android:layout_height="wrap_content"

        android:layout_weight="1"

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

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

        android:textDirection="locale"

        android:marqueeRepeatLimit="marquee_forever"

        android:singleLine="true"

packages/SystemUI/res/layout/qs_carrier_group.xml

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

        android:minHeight="48dp"

        android:gravity="center_vertical"

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

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

        android:textDirection="locale"

        android:marqueeRepeatLimit="marquee_forever"

        android:singleLine="true"

packages/SystemUI/res/layout/qs_customize_divider.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
    android:gravity="center"

    android:paddingTop="24dp"

    android:paddingBottom="24dp"

    android:textAppearance="@style/TextAppearance.QSEdit.Headers"

    android:textAppearance="@style/TextAppearance.QSEdit"

    android:text="@string/drag_to_add_tiles" />

packages/SystemUI/res/layout/qs_customize_header.xml

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

    android:gravity="center"

    android:minHeight="@dimen/qs_customize_header_min_height"

    android:textAppearance="@style/TextAppearance.QSEdit.Headers"

    android:textAppearance="@style/TextAppearance.QSEdit"

    android:text="@string/drag_to_rearrange_tiles" />
 
 No newline at end of file

packages/SystemUI/res/layout/qs_footer_impl.xml

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

                android:gravity="center_vertical"

                android:singleLine="true"

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

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

                android:visibility="gone" />



            <com.android.systemui.qs.PageIndicator