From bc10c65c52feb49ed75a8181394a00423c64db7f Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 25 Apr 2019 12:49:56 -0700
Subject: [PATCH] For #2035 Add TouchExplorationStateChangeListener and adjust
 toolbar

---
 .../org/mozilla/fenix/browser/BrowserFragment.kt  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 99816b8ca..8bb1d4b96 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -78,7 +78,8 @@ import org.mozilla.fenix.utils.Settings
 import kotlin.coroutines.CoroutineContext
 
 @SuppressWarnings("TooManyFunctions", "LargeClass")
-class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
+class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
+    AccessibilityManager.TouchExplorationStateChangeListener {
     private lateinit var toolbarComponent: ToolbarComponent
 
     private var sessionObserver: Session.Observer? = null
@@ -304,8 +305,8 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
     @Suppress("ComplexMethod")
     override fun onStart() {
         super.onStart()
-        setToolbarBehavior(false)
         sessionObserver = subscribeToSession()
+        updateToolbar()
         getAutoDisposeObservable<SearchAction>()
             .subscribe {
                 when (it) {
@@ -568,6 +569,16 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
         return observer
     }
 
+    override fun onTouchExplorationStateChanged(enabled: Boolean) {
+        updateToolbar()
+    }
+
+    private fun updateToolbar() {
+        getSessionById()?.loading?.let {
+            setToolbarBehavior(it)
+        }
+    }
+
     private fun setToolbarBehavior(loading: Boolean) {
         if (getSessionById()?.isCustomTabSession() == true) { return }