From 1639b1d3a111c7755ce17ca8e47c1357e4861bb7 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 8 Jun 2020 13:21:56 -0700
Subject: [PATCH] For #11342 - Fixes missing space for the FAB

---
 .../mozilla/fenix/tabtray/TabTrayDialogFragment.kt   |  5 ++++-
 .../java/org/mozilla/fenix/tabtray/TabTrayView.kt    | 12 +++++++++++-
 app/src/main/res/layout/fragment_tab_tray_dialog.xml |  3 +--
 app/src/main/res/values/styles.xml                   |  2 ++
 4 files changed, 18 insertions(+), 4 deletions(-)

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 @@
     <style name="BottomSheetModal" parent="Widget.Design.BottomSheet.Modal">
         <item name="shapeAppearance">@style/BottomSheetShapeAppearance</item>
         <item name="behavior_fitToContents">false</item>
+        <item name="behavior_expandedOffset">80</item>
+        <item name="behavior_skipCollapsed">true</item>
     </style>
 
     <style name="TabTrayFab" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">