For mozilla-mobile#14902 - Disabling bottom toolbar animation now wor…

…ks (mozilla-mobile#14927)
abhijitvalluri · Sep 11, 2020 · d21caf7 · d21caf7
1 parent 93bc875
commit d21caf7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@@ -232,8 +232,12 @@ class BrowserToolbarView(
     fun setScrollFlags(shouldDisableScroll: Boolean = false) {
         when (settings.toolbarPosition) {
             ToolbarPosition.BOTTOM -> {
-                (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
-                    behavior = BrowserToolbarBottomBehavior(view.context, null)
+                if (settings.isDynamicToolbarEnabled) {
+                    (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
+                        behavior = BrowserToolbarBottomBehavior(view.context, null)
+                    }
+                } else {
+                    expand()
                 }
             }
             ToolbarPosition.TOP -> {