From ea4c342797fb948600d115744fdf093436f26bc6 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 28 May 2020 10:17:55 -0500
Subject: [PATCH] For #10877 - Show 'no tabs' message when no tabs are open
 (#10960)

---
 .../org/mozilla/fenix/tabtray/TabTrayView.kt  |  5 +++--
 .../main/res/layout/component_tabstray.xml    | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index 0edb22cc5..5184f2430 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -145,12 +145,13 @@ class TabTrayView(
     }
 
     fun updateState(state: BrowserState) {
-        val shouldHide = if (isPrivateModeSelected) {
+        val hasNoTabs = if (isPrivateModeSelected) {
             state.privateTabs.isEmpty()
         } else {
             state.normalTabs.isEmpty()
         }
-        view?.tab_tray_overflow?.isVisible = !shouldHide
+        view?.tab_tray_empty_view?.isVisible = hasNoTabs
+        view?.tab_tray_overflow?.isVisible = !hasNoTabs
     }
 
     override fun onTabClosed(tab: Tab) {
diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 97b94ff92..f9b0d1224 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -14,6 +14,7 @@
     style="@style/BottomSheetModal"
     android:backgroundTint="@color/foundation_normal_theme"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
     <View
         android:id="@+id/handle"
         android:layout_width="0dp"
@@ -24,6 +25,22 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.1"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tab_tray_empty_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:gravity="center_horizontal"
+        android:paddingTop="80dp"
+        android:text="@string/no_open_tabs_description"
+        android:textColor="?secondaryText"
+        android:textSize="16sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/tabsTray" />
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
         android:layout_width="0dp"
@@ -52,6 +69,7 @@
             android:contentDescription="@string/tabs_header_private_tabs_title" />
 
     </com.google.android.material.tabs.TabLayout>
+
     <ImageButton
         android:id="@+id/tab_tray_overflow"
         android:layout_width="48dp"
@@ -64,6 +82,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tab_layout"
         app:layout_constraintBottom_toBottomOf="@id/tab_layout" />
+
     <mozilla.components.concept.tabstray.TabsTray
         android:id="@+id/tabsTray"
         android:layout_width="0dp"
@@ -80,4 +99,5 @@
         mozac:tabsTraySelectedItemTextColor="@color/tab_tray_item_selected_background_normal_theme"
         mozac:tabsTrayItemUrlTextColor="@color/tab_tray_item_selected_background_normal_theme"
         mozac:tabsTraySelectedItemUrlTextColor="@color/tab_tray_item_url_normal_theme" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>