From 8c47b988b88d9f477a7c3bdd973f598f657c79b1 Mon Sep 17 00:00:00 2001
From: person808 <kainaluh808@gmail.com>
Date: Thu, 4 Jun 2020 14:41:50 -0700
Subject: [PATCH] For #10525 - Remove tab tray item dividers.

---
 .../java/org/mozilla/fenix/HomeActivity.kt    | 23 +++++--------------
 .../main/res/drawable/tab_tray_divider.xml    | 12 ----------
 app/src/main/res/values-ldrtl/dimens.xml      |  4 ----
 app/src/main/res/values/attrs.xml             |  1 -
 app/src/main/res/values/dimens.xml            |  2 --
 app/src/main/res/values/styles.xml            |  2 --
 6 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 app/src/main/res/drawable/tab_tray_divider.xml

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 9b479b137..07f717e16 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -15,7 +15,6 @@ import androidx.annotation.IdRes
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.VisibleForTesting.PROTECTED
 import androidx.appcompat.app.ActionBar
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.lifecycleScope
@@ -24,7 +23,6 @@ import androidx.navigation.NavDirections
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.NavigationUI
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_home.*
 import kotlinx.coroutines.CoroutineScope
@@ -54,17 +52,17 @@ import org.mozilla.fenix.browser.browsingmode.DefaultBrowsingModeManager
 import org.mozilla.fenix.components.metrics.BreadcrumbsRecorder
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.exceptions.ExceptionsFragmentDirections
-import org.mozilla.fenix.ext.checkAndUpdateScreenshotPermission
-import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.alreadyOnDestination
-import org.mozilla.fenix.ext.settings
+import org.mozilla.fenix.ext.checkAndUpdateScreenshotPermission
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.nav
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.home.HomeFragmentDirections
+import org.mozilla.fenix.home.intent.CrashReporterIntentProcessor
 import org.mozilla.fenix.home.intent.DeepLinkIntentProcessor
 import org.mozilla.fenix.home.intent.OpenBrowserIntentProcessor
-import org.mozilla.fenix.home.intent.StartSearchIntentProcessor
-import org.mozilla.fenix.home.intent.CrashReporterIntentProcessor
 import org.mozilla.fenix.home.intent.SpeechProcessingIntentProcessor
+import org.mozilla.fenix.home.intent.StartSearchIntentProcessor
 import org.mozilla.fenix.library.bookmarks.BookmarkFragmentDirections
 import org.mozilla.fenix.library.history.HistoryFragmentDirections
 import org.mozilla.fenix.perf.Performance
@@ -235,20 +233,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity() {
             }
 
             val adapter = FenixTabsAdapter(context)
-            val decoration = DividerItemDecoration(
-                context,
-                DividerItemDecoration.VERTICAL
-            )
-            val drawable = AppCompatResources.getDrawable(context, R.drawable.tab_tray_divider)
-            drawable?.let {
-                decoration.setDrawable(it)
-            }
             BrowserTabsTray(
                 context,
                 attrs,
                 tabsAdapter = adapter,
-                layout = layout,
-                itemDecoration = decoration
+                layout = layout
             )
         }
         else -> super.onCreateView(parent, name, context, attrs)
diff --git a/app/src/main/res/drawable/tab_tray_divider.xml b/app/src/main/res/drawable/tab_tray_divider.xml
deleted file mode 100644
index 24190490e..000000000
--- a/app/src/main/res/drawable/tab_tray_divider.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Do this along with adding your values and values-ldrtl dimensions. -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:insetLeft="@dimen/tab_tray_divider_margin_start"
-    android:insetRight="@dimen/tab_tray_divider_margin_end">
-
-    <shape>
-        <size android:height="1dp"/>
-        <solid android:color="@color/tab_tray_item_divider_normal_theme" />
-    </shape>
-
-</inset>
diff --git a/app/src/main/res/values-ldrtl/dimens.xml b/app/src/main/res/values-ldrtl/dimens.xml
index 6c31150c2..1d4fc34d0 100644
--- a/app/src/main/res/values-ldrtl/dimens.xml
+++ b/app/src/main/res/values-ldrtl/dimens.xml
@@ -5,8 +5,4 @@
 <resources>
     <!--  Onboarding  -->
     <dimen name="onboarding_dual_pane_radio_button_translation_x">7dp</dimen>
-
-    <!-- Tabs Tray -->
-    <dimen name="tab_tray_divider_margin_start">0dp</dimen>
-    <dimen name="tab_tray_divider_margin_end">124dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3f139aa8f..98d45db5f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -54,7 +54,6 @@
     <attr name="tabTrayItemBackground" format="reference" />
     <attr name="tabTrayItemSelectedBackground" format="reference" />
     <attr name="tabTrayToolbarBackground" format="reference" />
-    <attr name="tabTrayItemDivider" format="reference" />
     <attr name="tabTrayItemMediaBackground" format="reference" />
     <attr name="tabTrayHeadingIcon" format="reference" />
     <attr name="tabTrayHeadingIconInactive" format="reference" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 83fbbf8ba..eed8da787 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -148,8 +148,6 @@
     <dimen name="addon_details_rating_view_margin_end">6dp</dimen>
 
     <!-- Tabs Tray -->
-    <dimen name="tab_tray_divider_margin_start">124dp</dimen>
-    <dimen name="tab_tray_divider_margin_end">0dp</dimen>
     <dimen name="tab_tray_top_offset">40dp</dimen>
 
     <!-- Saved Logins Fragment -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bc075333a..4f39b51d6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -77,7 +77,6 @@
         <item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
         <item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_normal_theme</item>
         <item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_normal_theme</item>
-        <item name="tabTrayItemDivider">@color/tab_tray_item_divider_normal_theme</item>
         <item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_normal_theme</item>
         <item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_normal_theme</item>
         <item name="tabTrayHeadingIconInactive">@color/tab_tray_heading_icon_inactive_normal_theme</item>
@@ -203,7 +202,6 @@
         <item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
         <item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_private_theme</item>
         <item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_private_theme</item>
-        <item name="tabTrayItemDivider">@color/tab_tray_item_divider_private_theme</item>
         <item name="tabTrayItemMediaBackground">@color/tab_tray_item_media_background_private_theme</item>
         <item name="tabTrayHeadingIcon">@color/tab_tray_heading_icon_dark_theme</item>
         <item name="tabTrayHeadingIconInactive">@color/tab_tray_heading_icon_inactive_dark_theme</item>