For #2035 - Fixes a11y and loading toolbar behavior logic (#2243)

nightly-build-test
Emily Kager 5 years ago committed by Colin Lee
parent 7ab19a71fc
commit aa6d36dda9

@ -690,13 +690,11 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope,
// Stop toolbar from collapsing if TalkBack is enabled or page is loading
val accessibilityManager = context
?.getSystemService(Context.ACCESSIBILITY_SERVICE) as? AccessibilityManager
if (accessibilityManager?.isTouchExplorationEnabled == false) {
if (!loading) {
behavior = BrowserToolbarBottomBehavior(context, null)
} else {
(behavior as? BrowserToolbarBottomBehavior)?.forceExpand(toolbarView)
behavior = null
}
if (loading || accessibilityManager?.isTouchExplorationEnabled == true) {
(behavior as? BrowserToolbarBottomBehavior)?.forceExpand(toolbarView)
behavior = null
} else {
behavior = BrowserToolbarBottomBehavior(context, null)
}
}
}

Loading…
Cancel
Save