For #14902 - Disabling bottom toolbar animation now works (#14927)

4 years ago · b54949e58f
parent f9b2d65993
commit b54949e58f
1 changed files with 6 additions and 2 deletions
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@ -227,9 +227,13 @@ class BrowserToolbarView(
    fun setScrollFlags(shouldDisableScroll: Boolean = false) {
        when (settings.toolbarPosition) {
            ToolbarPosition.BOTTOM -> {
+                if (settings.isDynamicToolbarEnabled) {
                    (view.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
                        behavior = BrowserToolbarBottomBehavior(view.context, null)
                    }
+                } else {
+                    expand()
+                }
            }
            ToolbarPosition.TOP -> {
                view.updateLayoutParams<AppBarLayout.LayoutParams> {