Merge #6549

6549: For #6548: Force expand toolbar if touch unhandled r=mugurell a=sblatz Co-authored-by: Sawyer Blatz <[email protected]>
mozilla-mobile · Apr 7, 2020 · 2f4dba9 · 2f4dba9
2 parents 4c77753 + 1ea8ac0
commit 2f4dba9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...src/main/java/mozilla/components/browser/toolbar/behavior/BrowserToolbarBottomBehavior.kt b/...src/main/java/mozilla/components/browser/toolbar/behavior/BrowserToolbarBottomBehavior.kt
@@ -79,6 +79,12 @@ class BrowserToolbarBottomBehavior(
             shouldSnapAfterScroll = type == ViewCompat.TYPE_TOUCH
             snapAnimator.cancel()
             true
+        } else if (engineView?.getInputResult() == EngineView.InputResult.INPUT_RESULT_UNHANDLED) {
+            // Force expand the toolbar if event is unhandled, otherwise user could get stuck in a
+            // state where they cannot show the toolbar
+            forceExpand(child)
+            snapAnimator.cancel()
+            false
         } else {
             false
         }