diff --git a/app/src/main/java/org/mozilla/fenix/home/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/home/ToolbarView.kt index c37ae5e22..b36403040 100644 --- a/app/src/main/java/org/mozilla/fenix/home/ToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/ToolbarView.kt @@ -66,16 +66,27 @@ class ToolbarView( gravity = Gravity.TOP } + val isTabletAndTabStripEnabled = context.resources.getBoolean(R.bool.tablet) ConstraintSet().apply { clone(binding.toolbarLayout) clear(binding.bottomBar.id, ConstraintSet.BOTTOM) clear(binding.bottomBarShadow.id, ConstraintSet.BOTTOM) - connect( - binding.bottomBar.id, - ConstraintSet.TOP, - ConstraintSet.PARENT_ID, - ConstraintSet.TOP, - ) + + if (isTabletAndTabStripEnabled) { + connect( + binding.bottomBar.id, + ConstraintSet.TOP, + binding.tabStripView.id, + ConstraintSet.BOTTOM, + ) + } else { + connect( + binding.bottomBar.id, + ConstraintSet.TOP, + ConstraintSet.PARENT_ID, + ConstraintSet.TOP, + ) + } connect( binding.bottomBarShadow.id, ConstraintSet.TOP, @@ -98,7 +109,12 @@ class ToolbarView( binding.homeAppBar.updateLayoutParams { topMargin = - context.resources.getDimensionPixelSize(R.dimen.home_fragment_top_toolbar_header_margin) + context.resources.getDimensionPixelSize(R.dimen.home_fragment_top_toolbar_header_margin) + + if (isTabletAndTabStripEnabled) { + context.resources.getDimensionPixelSize(R.dimen.tab_strip_height) + } else { + 0 + } } } diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt index fc186e8da..5c362119f 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt @@ -4,9 +4,11 @@ package org.mozilla.fenix.search.toolbar +import android.view.ViewGroup import androidx.annotation.VisibleForTesting import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat +import androidx.core.view.updateMargins import mozilla.components.browser.toolbar.BrowserToolbar import mozilla.components.concept.toolbar.Toolbar import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature @@ -123,6 +125,12 @@ class ToolbarView( } }, ) + + if (settings.isTabletAndTabStripEnabled) { + (layoutParams as ViewGroup.MarginLayoutParams).updateMargins( + top = context.resources.getDimensionPixelSize(R.dimen.tab_strip_height), + ) + } } } diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml index b61d82c1b..34a879205 100644 --- a/app/src/main/res/layout/fragment_browser.xml +++ b/app/src/main/res/layout/fragment_browser.xml @@ -13,6 +13,14 @@ android:id="@+id/browserWindow" android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + + 48dp + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c48be70a5..8e990dae9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -70,6 +70,7 @@ 56dp + 0dp 48dp