diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
index dad123c1c..ca0f57dcb 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
@@ -94,7 +94,10 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), TabTrayInteractor {
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
- if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+ val isLandscape = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE
+ tabTrayView.setTopOffset(isLandscape)
+
+ if (isLandscape) {
tabTrayView.expand()
}
}
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index 7eb9f42c9..f5b365632 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -104,7 +104,7 @@ class TabTrayView(
expand()
}
- behavior.setExpandedOffset(view.context.resources.getDimension(R.dimen.tab_tray_top_offset).toInt())
+ setTopOffset(startingInLandscape)
(view.tabsTray as? BrowserTabsTray)?.also { tray ->
TabsTouchHelper(tray.tabsAdapter).attachToRecyclerView(tray)
@@ -199,6 +199,16 @@ class TabTrayView(
}
}
+ fun setTopOffset(landscape: Boolean) {
+ val topOffset = if (landscape) {
+ 0
+ } else {
+ view.context.resources.getDimension(R.dimen.tab_tray_top_offset).toInt()
+ }
+
+ behavior.setExpandedOffset(topOffset)
+ }
+
companion object {
private const val DEFAULT_TAB_ID = 0
private const val PRIVATE_TAB_ID = 1
diff --git a/app/src/main/res/layout/fragment_tab_tray_dialog.xml b/app/src/main/res/layout/fragment_tab_tray_dialog.xml
index 3c9751185..55db6639e 100644
--- a/app/src/main/res/layout/fragment_tab_tray_dialog.xml
+++ b/app/src/main/res/layout/fragment_tab_tray_dialog.xml
@@ -7,5 +7,4 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tabLayout"
android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:clipToPadding="false" />
+ android:layout_width="match_parent" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9a9b58647..78b257db4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -560,6 +560,8 @@