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

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

Merge "[Notif redesign] Swap history and settings buttons" into main

parents 5ad52889 80d1c8c4
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@
            android:layout_height="wrap_content">

            <com.android.systemui.statusbar.notification.row.FooterViewButton
                android:id="@+id/settings_button"
                android:id="@+id/history_button"
                style="@style/TextAppearance.NotificationFooterButtonRedesign"
                android:layout_width="wrap_content"
                android:layout_height="48dp"
                android:background="@drawable/notif_footer_btn_background"
                android:contentDescription="@string/notification_settings_button_description"
                android:drawableStart="@drawable/notif_footer_btn_settings"
                android:contentDescription="@string/notification_history_button_description"
                android:drawableStart="@drawable/notif_footer_btn_history"
                android:focusable="true"
                app:layout_constraintStart_toStartOf="parent" />

@@ -64,17 +64,17 @@
                android:contentDescription="@string/accessibility_clear_all"
                android:focusable="true"
                android:text="@string/clear_all_notifications_text"
                app:layout_constraintEnd_toStartOf="@id/history_button"
                app:layout_constraintStart_toEndOf="@id/settings_button" />
                app:layout_constraintEnd_toStartOf="@id/settings_button"
                app:layout_constraintStart_toEndOf="@id/history_button" />

            <com.android.systemui.statusbar.notification.row.FooterViewButton
                android:id="@+id/history_button"
                android:id="@+id/settings_button"
                style="@style/TextAppearance.NotificationFooterButtonRedesign"
                android:layout_width="wrap_content"
                android:layout_height="48dp"
                android:background="@drawable/notif_footer_btn_background"
                android:contentDescription="@string/notification_history_button_description"
                android:drawableStart="@drawable/notif_footer_btn_history"
                android:contentDescription="@string/notification_settings_button_description"
                android:drawableStart="@drawable/notif_footer_btn_settings"
                android:focusable="true"
                app:layout_constraintEnd_toEndOf="parent" />
        </androidx.constraintlayout.widget.ConstraintLayout>