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

Commit 95c04019 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I16034fb2,Ib06c3d34 into main 

* changes:
  Ellipsize "Clear all" text when necessary
  Rename new footer XML
parents 9f818d05 c10567ea

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterViewTest.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class FooterViewTest extends SysuiTestCase { 
    public void setUp() {

        if (NotifRedesignFooter.isEnabled()) {

            mView = (FooterView) LayoutInflater.from(mSpyContext).inflate(

                    R.layout.status_bar_notification_footer_redesign, null, false);

                    R.layout.notification_2025_footer, null, false);

        } else {

            mView = (FooterView) LayoutInflater.from(mSpyContext).inflate(

                    R.layout.status_bar_notification_footer, null, false);

packages/SystemUI/res/layout/status_bar_notification_footer_redesign.xml→packages/SystemUI/res/layout/notification_2025_footer.xml

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
                android:contentDescription="@string/accessibility_clear_all"

                android:focusable="true"

                android:text="@string/clear_all_notifications_text"

                android:ellipsize="end"

                android:maxLines="1"

                app:layout_constraintEnd_toStartOf="@id/settings_button"

                app:layout_constraintStart_toEndOf="@id/history_button" />

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/NotificationListViewBinder.kt

+1 −2
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ constructor( 
            // The footer needs to be re-inflated every time the theme or the font size changes.

            configuration

                .inflateLayout<FooterView>(

                    if (NotifRedesignFooter.isEnabled)

                        R.layout.status_bar_notification_footer_redesign

                    if (NotifRedesignFooter.isEnabled) R.layout.notification_2025_footer

                    else R.layout.status_bar_notification_footer,

                    parentView,

                    attachToRoot = false,