Custom Tab: Remove the legacy omnibar layout

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

@@ -149,7 +149,6 @@ import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
 import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
 import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
 import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
-import com.duckduckgo.app.browser.omnibar.OmnibarItemPressedListener
 import com.duckduckgo.app.browser.omnibar.OmnibarType
 import com.duckduckgo.app.browser.omnibar.QueryOrigin
 import com.duckduckgo.app.browser.print.PrintDocumentAdapterFactory
@@ -1041,7 +1040,6 @@ class BrowserTabFragment :
         omnibar = Omnibar(
             omnibarType = settingsDataStore.omnibarType,
             binding = binding,
-            isUnifiedOmnibarEnabled = omnibarRepository.isUnifiedOmnibarLayoutEnabled,
         )
 
         webViewContainer = binding.webViewContainer
@@ -3087,13 +3085,6 @@ class BrowserTabFragment :
                 }
             },
         )
-        omnibar.configureOmnibarItemPressedListeners(
-            object : OmnibarItemPressedListener {
-                override fun onBackButtonPressed() {
-                    hideKeyboard()
-                }
-            },
-        )
     }
 
     private fun configureOmnibarTextInput() {

app/src/main/java/com/duckduckgo/app/browser/omnibar/Omnibar.kt

@@ -60,7 +60,6 @@ import logcat.logcat
 class Omnibar(
     val omnibarType: OmnibarType,
     private val binding: FragmentBrowserTabBinding,
-    isUnifiedOmnibarEnabled: Boolean,
 ) {
     interface ItemPressedListener {
         fun onTabsButtonPressed()
@@ -154,37 +153,7 @@ class Omnibar(
     }
 
     val omnibarView: OmnibarView by lazy {
-        if (isUnifiedOmnibarEnabled) {
-            setupUnifiedOmnibar()
-        } else {
-            setupSingleOmnibar()
-        }
-    }
-
-    private fun setupSingleOmnibar(): OmnibarView {
-        binding.rootView.removeView(binding.omnibarLayoutTop)
-        binding.rootView.removeView(binding.omnibarLayoutBottom)
-
-        return when (omnibarType) {
-            OmnibarType.SINGLE_TOP -> {
-                binding.rootView.removeView(binding.singleOmnibarLayoutBottom)
-                binding.singleOmnibarLayoutTop
-            }
-
-            OmnibarType.SINGLE_BOTTOM -> {
-                binding.rootView.removeView(binding.singleOmnibarLayoutTop)
-                adjustCoordinatorLayoutBehaviorForBottomOmnibar()
-                binding.singleOmnibarLayoutBottom
-            }
-            else -> throw IllegalStateException("Invalid omnibar type for single omnibar setup: $omnibarType")
-        }
-    }
-
-    private fun setupUnifiedOmnibar(): OmnibarView {
-        binding.rootView.removeView(binding.singleOmnibarLayoutTop)
-        binding.rootView.removeView(binding.singleOmnibarLayoutBottom)
-
-        return when (omnibarType) {
+        when (omnibarType) {
             OmnibarType.SINGLE_TOP -> {
                 binding.rootView.removeView(binding.omnibarLayoutBottom)
                 binding.omnibarLayoutTop
@@ -235,10 +204,6 @@ class Omnibar(
         omnibarView.omnibarTextInput
     }
 
-    val omniBarContainer: View by lazy {
-        omnibarView.omniBarContainer
-    }
-
     val toolbar: Toolbar by lazy {
         omnibarView.toolbar
     }
@@ -305,13 +270,6 @@ class Omnibar(
         omnibarView.setLogoClickListener(logoClickListener)
     }
 
-    fun configureOmnibarItemPressedListeners(listener: OmnibarItemPressedListener) {
-        val omnibar = omnibarView
-        if (omnibar is SingleOmnibarLayout) {
-            omnibar.setSingleOmnibarItemPressedListener(listener)
-        }
-    }
-
     fun configureInputScreenLaunchListener(listener: InputScreenLaunchListener) {
         omnibarView.setInputScreenLaunchListener(listener)
     }

app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarFeatureRepository.kt

@@ -44,20 +44,15 @@ open class OmnibarFeatureRepository @Inject constructor(
     @AppCoroutineScope private val coroutineScope: CoroutineScope,
 ) : OmnibarRepository, MainProcessLifecycleObserver {
     private var isSplitOmnibarFlagEnabled: Boolean = false
-    private var isUnifiedOmnibarFlagEnabled: Boolean = false
 
     override val omnibarType: OmnibarType
         get() = settingsDataStore.omnibarType
 
     override val isSplitOmnibarAvailable: Boolean
-        get() = isSplitOmnibarFlagEnabled && isUnifiedOmnibarFlagEnabled
-
-    override val isUnifiedOmnibarLayoutEnabled: Boolean
-        get() = isUnifiedOmnibarFlagEnabled
+        get() = isSplitOmnibarFlagEnabled
 
     override fun onStart(owner: LifecycleOwner) {
         coroutineScope.launch(dispatcherProvider.io()) {
-            isUnifiedOmnibarFlagEnabled = browserFeatures.useUnifiedOmnibarLayout().isEnabled()
             isSplitOmnibarFlagEnabled = browserFeatures.splitOmnibar().isEnabled()
 
             resetOmnibarTypeIfNecessary()

app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayout.kt

@@ -233,11 +233,11 @@ class OmnibarLayout @JvmOverloads constructor(
             }
         }
 
-    private val experimentalOmnibarCardMarginTop by lazy {
+    private val omnibarCardMarginTop by lazy {
         resources.getDimensionPixelSize(CommonR.dimen.omnibarCardMarginTop)
     }
 
-    private val experimentalOmnibarCardMarginBottom by lazy {
+    private val omnibarCardMarginBottom by lazy {
         resources.getDimensionPixelSize(CommonR.dimen.omnibarCardMarginBottom)
     }
 
@@ -626,22 +626,22 @@ class OmnibarLayout @JvmOverloads constructor(
             // When omnibar is at the bottom, we're adding an additional space at the top
             omnibarCardShadow.updateLayoutParams {
                 (this as MarginLayoutParams).apply {
-                    topMargin = experimentalOmnibarCardMarginBottom
-                    bottomMargin = experimentalOmnibarCardMarginTop
+                    topMargin = omnibarCardMarginBottom
+                    bottomMargin = omnibarCardMarginTop
                 }
             }
 
             iconsContainer.updateLayoutParams {
                 (this as MarginLayoutParams).apply {
-                    topMargin = experimentalOmnibarCardMarginBottom
-                    bottomMargin = experimentalOmnibarCardMarginTop
+                    topMargin = omnibarCardMarginBottom
+                    bottomMargin = omnibarCardMarginTop
                 }
             }
 
             shieldIconPulseAnimationContainer.updateLayoutParams {
                 (this as MarginLayoutParams).apply {
-                    topMargin = experimentalOmnibarCardMarginBottom
-                    bottomMargin = experimentalOmnibarCardMarginTop
+                    topMargin = omnibarCardMarginBottom
+                    bottomMargin = omnibarCardMarginTop
                     if (addressBarTrackersAnimationFeatureToggle.feature().isEnabled()) {
                         // TODO when the animation is made permanent we should add this adjustment to the actual layout
                         marginStart = 1.toPx()