From e5a87419947b87c30102fb3a873e9cf05c6d9204 Mon Sep 17 00:00:00 2001
From: Emily Kager <emilykager@gmail.com>
Date: Tue, 14 May 2019 14:34:01 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/2035 - Register Accessibility
 Manager Listener (https://github.com/mozilla-mobile/fenix/pull/2462)

---
 .../java/org/mozilla/fenix/browser/BrowserFragment.kt | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 f1acc0155..21ec8306f 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -89,8 +89,7 @@ import org.mozilla.fenix.utils.Settings
 import kotlin.coroutines.CoroutineContext
 
 @SuppressWarnings("TooManyFunctions", "LargeClass")
-class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
-    AccessibilityManager.TouchExplorationStateChangeListener {
+class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
     private lateinit var toolbarComponent: ToolbarComponent
 
     private var sessionObserver: Session.Observer? = null
@@ -369,6 +368,10 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
         super.onStart()
         sessionObserver = subscribeToSession()
         sessionManagerObserver = subscribeToSessions()
+        val accessibilityManager = activity?.getSystemService(Context.ACCESSIBILITY_SERVICE) as? AccessibilityManager
+        accessibilityManager?.addTouchExplorationStateChangeListener {
+            updateToolbar()
+        }
         updateToolbar()
         getSessionById()?.let { updateBookmarkState(it) }
         getAutoDisposeObservable<SearchAction>()
@@ -724,10 +727,6 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
         }.also { requireComponents.core.sessionManager.register(it) }
     }
 
-    override fun onTouchExplorationStateChanged(enabled: Boolean) {
-        updateToolbar()
-    }
-
     private fun updateToolbar() {
         getSessionById()?.loading?.let {
             setToolbarBehavior(it)