Merge tag '5.78.1' into develop

no message

Author: cmonfortep

app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

@@ -21,6 +21,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.EXTRA_TEXT
 import android.os.Bundle
+import android.os.Handler
 import android.os.Message
 import android.view.View
 import android.widget.Toast
@@ -374,7 +375,13 @@ class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope() {
     }
 
     private fun hideMockupOmnibar() {
-        appBarLayoutMockup.visibility = View.GONE
+        // Delaying this code to avoid race condition when fragment and activity recreated
+        Handler().postDelayed(
+            {
+                appBarLayoutMockup?.visibility = View.GONE
+            },
+            300
+        )
     }
 
     companion object {

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -483,15 +483,13 @@ class BrowserTabFragment :
         appBarLayout.setExpanded(true)
         webView?.onPause()
         webView?.hide()
-        omnibarScrolling.disableOmnibarScrolling(toolbarContainer)
         homeBackgroundLogo.showLogo()
     }
 
     private fun showBrowser() {
         newTabLayout.gone()
         webView?.show()
         webView?.onResume()
-        omnibarScrolling.enableOmnibarScrolling(toolbarContainer)
         homeBackgroundLogo.hideLogo()
     }
 
@@ -1432,12 +1430,14 @@ class BrowserTabFragment :
             fireMenuButton?.isVisible = viewState.fireButton is FireButton.Visible
             menuButton?.isVisible = viewState.showMenuButton
 
+            // omnibar only scrollable when browser showing and the fire button is not promoted
             if (viewState.fireButton.playPulseAnimation()) {
-                appBarLayout.setExpanded(true, true)
                 omnibarScrolling.disableOmnibarScrolling(toolbarContainer)
                 playPulseAnimation()
             } else {
-                omnibarScrolling.enableOmnibarScrolling(toolbarContainer)
+                if (viewState.browserShowing) {
+                    omnibarScrolling.enableOmnibarScrolling(toolbarContainer)
+                }
                 pulseAnimation.stop()
             }
         }