For #19815 - Keeps tabTray FAB from obstructing last tab (#19891)

* For #19815 - Keeps tabTray FAB from obstructing last tab
mozilla-mobile · Jun 9, 2021 · c74bf4e · c74bf4e
1 parent ace835d
commit c74bf4e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/res/layout/component_sync_tabs_tray_layout.xml b/app/src/main/res/layout/component_sync_tabs_tray_layout.xml
@@ -13,6 +13,8 @@
         android:id="@+id/synced_tabs_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:paddingBottom="@dimen/tab_tray_list_bottom_padding"
         tools:listitem="@layout/sync_tabs_list_item"/>
 
 </org.mozilla.fenix.tabstray.syncedtabs.SyncedTabsTrayLayout>
diff --git a/app/src/main/res/layout/component_tabstray2.xml b/app/src/main/res/layout/component_tabstray2.xml
@@ -151,8 +151,6 @@
         android:id="@+id/tabsTray"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:clipToPadding="false"
-        android:paddingBottom="140dp"
         android:scrollbarStyle="outsideOverlay"
         android:scrollbars="vertical"
         android:orientation="horizontal"

diff --git a/app/src/main/res/layout/normal_browser_tray_list.xml b/app/src/main/res/layout/normal_browser_tray_list.xml
@@ -7,6 +7,8 @@
         android:id="@+id/tray_list_item"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:paddingBottom="@dimen/tab_tray_list_bottom_padding"
         android:visibility="gone"/>
 
     <TextView

diff --git a/app/src/main/res/layout/private_browser_tray_list.xml b/app/src/main/res/layout/private_browser_tray_list.xml
@@ -7,6 +7,8 @@
         android:id="@+id/tray_list_item"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:paddingBottom="@dimen/tab_tray_list_bottom_padding"
         android:visibility="gone"/>
 
     <TextView

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -189,6 +189,8 @@
     <dimen name="tab_tray_multiselect_handle_top_margin">0dp</dimen>
     <dimen name="tab_tray_new_collection_padding_start">24dp</dimen>
     <dimen name="tab_tray_new_collection_drawable_padding">28dp</dimen>
+    <!--  Keeps FAB from covering last item in list. Fab 64dp, top & bottom margins 16dp each.  -->
+    <dimen name="tab_tray_list_bottom_padding">96dp</dimen>
 
     <!-- Saved Logins Fragment -->
     <dimen name="saved_logins_sort_menu_dropdown_chevron_icon_margin_start">24dp</dimen>