From 6afcd2cee63fb7927787a97ee702c596ec0eea9c Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 24 Apr 2020 13:48:54 -0500
Subject: [PATCH] For #10201 - Provide proper button padding and no tabs
 message visibility in tabs tray

---
 .../mozilla/fenix/tabtray/TabTrayFragment.kt  |  3 ++-
 app/src/main/res/layout/fragment_tab_tray.xml | 19 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragment.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragment.kt
index 587ef3c41..a0a1de23c 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragment.kt
@@ -217,7 +217,8 @@ class TabTrayFragment : Fragment(R.layout.fragment_tab_tray), TabsTray.Observer,
     private fun onTabsChanged() {
         val hasNoTabs = getListOfSessions().toList().isEmpty()
 
-        view?.tab_tray_empty_view?.isVisible = !hasNoTabs
+        view?.tab_tray_empty_view?.isVisible = hasNoTabs
+        view?.tabsTray?.asView()?.isVisible = !hasNoTabs
         view?.save_to_collection_button?.isVisible = !hasNoTabs
 
         if (hasNoTabs) {
diff --git a/app/src/main/res/layout/fragment_tab_tray.xml b/app/src/main/res/layout/fragment_tab_tray.xml
index 775101b36..22e6ef7a3 100644
--- a/app/src/main/res/layout/fragment_tab_tray.xml
+++ b/app/src/main/res/layout/fragment_tab_tray.xml
@@ -5,7 +5,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mozac="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -36,15 +35,15 @@
         mozac:tabsTraySelectedItemBackgroundColor="?tabTrayItemSelectedBackground"
         mozac:tabsTraySelectedItemTextColor="?tabTrayItemSelectedText" />
 
-        <include
-            layout="@layout/save_to_collection_button"
-            android:id="@+id/save_to_collection_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            app:layout_constraintBottom_toTopOf="@id/bottomBarShadow"
-            app:layout_constraintTop_toBottomOf="@+id/tabsTray" />
+    <include
+        layout="@layout/save_to_collection_button"
+        android:id="@+id/save_to_collection_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@id/bottomBarShadow"
+        app:layout_constraintTop_toBottomOf="@+id/tabsTray" />
 
     <View
         android:id="@+id/bottomBarShadow"