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

Commit e9c755a2 authored by Yining Liu's avatar Yining Liu
Browse files

Fix overlapping Manage and Clear all buttons when display scale is at 

maximum

Fix the overlapping "Manage" and "Clear all" buttons in the Notification
Shade, when "Settings" > "Display size and text" > "Font size" and
"Display size" are maximized by using a Constraint Layout chain.

Test: Manual
1. Toggle "Settings" > "Display size and text" > "Font size",
and "Display size" to max.
2. Go to Settings > System > Languages > App languages.
Set the app language for Calculator and Calendar to Traditional Chinese.
3. Open the Shade and drag down, the "Manage" and "Clear all" buttons
should not overlap (though they may be next to each other)

Bug: 273401782
Bug: 287893062
Change-Id: Ifac1914f1f5428fc4b06dc141ade66eac1432985
parent e13db761

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+41 −28
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ 
<!-- Extends Framelayout -->

<com.android.systemui.statusbar.notification.row.FooterView

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

        xmlns:app="http://schemas.android.com/apk/res-auto"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:visibility="gone">

    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

        android:id="@+id/content"
@@ -37,13 +36,22 @@ 
            android:visibility="gone"

            android:textAppearance="?android:attr/textAppearanceButton"

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

        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            >

            <com.android.systemui.statusbar.notification.row.FooterViewButton

                style="@style/TextAppearance.NotificationSectionHeaderButton"

                android:id="@+id/manage_text"

                android:layout_width="wrap_content"

                android:layout_height="48dp"

                android:layout_marginTop="12dp"

            android:layout_gravity="start"

                android:layout_marginStart="16dp"

                app:layout_constraintVertical_bias="0.0"

                app:layout_constraintHorizontal_chainStyle="spread_inside"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintEnd_toStartOf="@id/dismiss_text"

                android:background="@drawable/notif_footer_btn_background"

                android:focusable="true"

                android:textColor="@color/notif_pill_text"
@@ -56,12 +64,17 @@ 
                android:layout_width="wrap_content"

                android:layout_height="48dp"

                android:layout_marginTop="12dp"

            android:layout_gravity="end"

                android:layout_marginEnd="16dp"

                app:layout_constraintVertical_bias="1.0"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintStart_toEndOf="@id/manage_text"

                android:background="@drawable/notif_footer_btn_background"

                android:focusable="true"

                android:textColor="@color/notif_pill_text"

                android:contentDescription="@string/accessibility_clear_all"

                android:text="@string/clear_all_notifications_text"

                />

        </androidx.constraintlayout.widget.ConstraintLayout>

    </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

</com.android.systemui.statusbar.notification.row.FooterView>