From 31e86842ddee90393f8694676c5f06f26c7b991e Mon Sep 17 00:00:00 2001
From: Noah Bond <87384386+MozillaNoah@users.noreply.github.com>
Date: Thu, 2 Dec 2021 15:00:33 -0800
Subject: [PATCH] For #22516 - Fixed alignment of "Show all" buttons on the
 homescreen (#22650)

* For #22516 - Fixed show all button alignment with section headers on the Homepage

* For #22516 - Added correct content description back in for recently visited show all button

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 app/src/main/res/layout/recent_bookmarks_header.xml | 7 +++----
 app/src/main/res/layout/recent_tabs_header.xml      | 9 ++++-----
 app/src/main/res/layout/recent_visits_header.xml    | 7 +++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/recent_bookmarks_header.xml b/app/src/main/res/layout/recent_bookmarks_header.xml
index b2f4c123e..1ee111061 100644
--- a/app/src/main/res/layout/recent_bookmarks_header.xml
+++ b/app/src/main/res/layout/recent_bookmarks_header.xml
@@ -25,16 +25,14 @@
         app:layout_constraintEnd_toStartOf="@id/showAllBookmarksButton"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.button.MaterialButton
+    <TextView
         android:id="@+id/showAllBookmarksButton"
         style="@style/Button14TextStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/recently_saved_show_all_content_description"
-        android:gravity="top"
         android:insetTop="0dp"
-        android:minHeight="16dp"
         android:paddingStart="16dp"
         android:paddingEnd="0dp"
         android:maxLines="1"
@@ -42,5 +40,6 @@
         android:text="@string/recently_saved_show_all"
         android:textColor="@color/home_show_all_button_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="@id/header" />
+    
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/recent_tabs_header.xml b/app/src/main/res/layout/recent_tabs_header.xml
index 6876c48a3..b51bad22d 100644
--- a/app/src/main/res/layout/recent_tabs_header.xml
+++ b/app/src/main/res/layout/recent_tabs_header.xml
@@ -23,16 +23,14 @@
         app:layout_constraintEnd_toStartOf="@id/show_all_button"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.button.MaterialButton
+    <TextView
         android:id="@+id/show_all_button"
         style="@style/Button14TextStyle"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/recent_tabs_show_all_content_description"
-        android:gravity="top"
         android:insetTop="0dp"
-        android:minHeight="16dp"
         android:paddingStart="16dp"
         android:paddingEnd="0dp"
         android:maxLines="1"
@@ -40,5 +38,6 @@
         android:text="@string/recent_tabs_show_all"
         android:textColor="@color/home_show_all_button_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="@id/header" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/recent_visits_header.xml b/app/src/main/res/layout/recent_visits_header.xml
index 340f7010b..bf01f4247 100644
--- a/app/src/main/res/layout/recent_visits_header.xml
+++ b/app/src/main/res/layout/recent_visits_header.xml
@@ -24,21 +24,20 @@
         app:layout_constraintEnd_toStartOf="@id/show_all_button"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.button.MaterialButton
+    <TextView
         android:id="@+id/show_all_button"
         style="@style/Button14TextStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/past_explorations_show_all_content_description"
-        android:gravity="top"
         android:insetTop="0dp"
-        android:minHeight="16dp"
         android:paddingStart="16dp"
         android:paddingEnd="0dp"
         android:maxLines="1"
+        android:nestedScrollingEnabled="false"
         android:text="@string/recent_tabs_show_all"
         android:textColor="@color/home_show_all_button_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="@id/header" />
 </androidx.constraintlayout.widget.ConstraintLayout>