From 063cf457baaf2dd1209c2b0179e7a4462f40c2c7 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 12 Jun 2020 17:52:06 -0500
Subject: [PATCH] For #11291 - Provide New Tab button when accessibility
 enabled (#11441)

---
 .../org/mozilla/fenix/tabtray/TabTrayView.kt  | 27 ++++++++++++++-----
 .../main/res/layout/component_tabstray.xml    | 12 +++++++++
 2 files changed, 33 insertions(+), 6 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 f5b365632..02668a8c3 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -25,6 +25,7 @@ import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.tabstray.BrowserTabsTray
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.settings
 
 interface TabTrayInteractor {
     fun onNewTabTapped(private: Boolean)
@@ -61,14 +62,18 @@ class TabTrayView(
         get() = container
 
     init {
+        val hasAccessibilityEnabled = view.context.settings().accessibilityServicesEnabled
+
         toggleFabText(isPrivate)
 
         behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
             override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                if (slideOffset >= SLIDE_OFFSET) {
-                    fabView.new_tab_button.show()
-                } else {
-                    fabView.new_tab_button.hide()
+                if (!hasAccessibilityEnabled) {
+                    if (slideOffset >= SLIDE_OFFSET) {
+                        fabView.new_tab_button.show()
+                    } else {
+                        fabView.new_tab_button.hide()
+                    }
                 }
             }
 
@@ -142,8 +147,18 @@ class TabTrayView(
                 }
         }
 
-        fabView.new_tab_button.setOnClickListener {
-            interactor.onNewTabTapped(isPrivateModeSelected)
+        view.tab_tray_new_tab.apply {
+            isVisible = hasAccessibilityEnabled
+            setOnClickListener {
+                interactor.onNewTabTapped(isPrivateModeSelected)
+            }
+        }
+
+        fabView.new_tab_button.apply {
+            isVisible = !hasAccessibilityEnabled
+            setOnClickListener {
+                interactor.onNewTabTapped(isPrivateModeSelected)
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 291b5135d..a7e5c381a 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -70,6 +70,18 @@
 
     </com.google.android.material.tabs.TabLayout>
 
+    <ImageButton
+        android:id="@+id/tab_tray_new_tab"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:visibility="gone"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/add_tab"
+        app:srcCompat="@drawable/ic_new"
+        app:layout_constraintTop_toTopOf="@id/tab_layout"
+        app:layout_constraintEnd_toStartOf="@id/tab_tray_overflow"
+        app:layout_constraintBottom_toBottomOf="@id/tab_layout" />
+
     <ImageButton
         android:id="@+id/tab_tray_overflow"
         android:layout_width="48dp"