From baccb153b734c9f0f8680da7e785336595519f18 Mon Sep 17 00:00:00 2001
From: person808 <kainaluh808@gmail.com>
Date: Tue, 22 Sep 2020 14:36:10 -0700
Subject: [PATCH] For #15219 - Fix tab tray handle size.

Also use dimens for the tab history handle.
---
 app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt | 4 ++--
 app/src/main/res/layout/component_tabhistory.xml           | 4 ++--
 app/src/main/res/layout/component_tabstray.xml             | 4 ++--
 app/src/main/res/values/dimens.xml                         | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

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 f0736b329..948fb9e88 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -433,14 +433,14 @@ class TabTrayView(
                 if (multiselect) {
                     R.dimen.tab_tray_multiselect_handle_height
                 } else {
-                    R.dimen.tab_tray_normal_handle_height
+                    R.dimen.bottom_sheet_handle_height
                 }
             )
             topMargin = view.resources.getDimensionPixelSize(
                 if (multiselect) {
                     R.dimen.tab_tray_multiselect_handle_top_margin
                 } else {
-                    R.dimen.tab_tray_normal_handle_top_margin
+                    R.dimen.bottom_sheet_handle_top_margin
                 }
             )
         }
diff --git a/app/src/main/res/layout/component_tabhistory.xml b/app/src/main/res/layout/component_tabhistory.xml
index 3095029a2..073753f5c 100644
--- a/app/src/main/res/layout/component_tabhistory.xml
+++ b/app/src/main/res/layout/component_tabhistory.xml
@@ -13,8 +13,8 @@
     <View
         android:id="@+id/handle"
         android:layout_width="0dp"
-        android:layout_height="3dp"
-        android:layout_marginTop="8dp"
+        android:layout_height="@dimen/bottom_sheet_handle_height"
+        android:layout_marginTop="@dimen/bottom_sheet_handle_top_margin"
         android:background="@color/secondary_text_normal_theme"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 9bd393734..e785b4dfd 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -16,8 +16,8 @@
     <View
         android:id="@+id/handle"
         android:layout_width="0dp"
-        android:layout_height="3dp"
-        android:layout_marginTop="8dp"
+        android:layout_height="@dimen/bottom_sheet_handle_height"
+        android:layout_marginTop="@dimen/bottom_sheet_handle_top_margin"
         android:background="@color/secondary_text_normal_theme"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 82375817f..6c7a98d91 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -70,6 +70,9 @@
     <!-- Bottom Sheet Fragment card -->
     <dimen name="bottom_sheet_corner_radius">8dp</dimen>
     <dimen name="bottom_sheet_top_padding">8dp</dimen>
+    <dimen name="bottom_sheet_handle_height">3dp</dimen>
+    <dimen name="bottom_sheet_handle_top_margin">8dp</dimen>
+
 
     <!-- Browser Toolbar -->
     <dimen name="browser_toolbar_height">56dp</dimen>
@@ -172,9 +175,7 @@
     <dimen name="tab_tray_thumbnail_height">69dp</dimen>
     <dimen name="tab_tray_favicon_border_radius">4dp</dimen>
     <dimen name="tab_tray_multiselect_handle_height">11dp</dimen>
-    <dimen name="tab_tray_normal_handle_height">11dp</dimen>
     <dimen name="tab_tray_multiselect_handle_top_margin">0dp</dimen>
-    <dimen name="tab_tray_normal_handle_top_margin">8dp</dimen>
     <dimen name="tab_tray_new_collection_padding_start">24dp</dimen>
     <dimen name="tab_tray_new_collection_drawable_padding">28dp</dimen>