From e2b72a9c011fc268caa45f83a5493abb255ce090 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Mon, 24 Feb 2020 15:09:50 -0600
Subject: [PATCH] For #8505 - Update tab icon

---
 .../fenix/components/toolbar/TabCounter.kt      |  7 +------
 app/src/main/res/drawable/ic_tabs.xml           | 17 +++++++++--------
 .../res/layout/mozac_ui_tabcounter_layout.xml   |  1 -
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
index f6571a0b8..28a087cab 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
@@ -210,12 +210,7 @@ open class TabCounter @JvmOverloads constructor(
                         // Only apply the size when we calculate a valid value.
                         counter_text.setTextSize(TypedValue.COMPLEX_UNIT_PX, sizeInPixel.toFloat())
                         counter_text.setTypeface(null, Typeface.BOLD)
-                        val shiftDp = TypedValue.applyDimension(
-                            TypedValue.COMPLEX_UNIT_DIP,
-                            if (newRatio == TWO_DIGITS_SIZE_RATIO) TWO_DIGIT_PADDING else ONE_DIGIT_PADDING,
-                            context.resources.displayMetrics
-                        ).toInt()
-                        counter_text.setPadding(0, shiftDp, shiftDp, 0)
+                        counter_text.setPadding(0, 0, 0, 0)
                     }
                 }
             })
diff --git a/app/src/main/res/drawable/ic_tabs.xml b/app/src/main/res/drawable/ic_tabs.xml
index d37154e6e..b202494f0 100644
--- a/app/src/main/res/drawable/ic_tabs.xml
+++ b/app/src/main/res/drawable/ic_tabs.xml
@@ -3,11 +3,12 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M15.22 22H5.78A3.78 3.78 0 0 1 2 18.22V8.78C2 6.69 3.7 5 5.78 5h9.44C17.31 5 19 6.7 19 8.78v9.44c0 2-1.7 3.78-3.78 3.78zM5.86 7C4.83 7 4 7.83 4 8.86v9.28C4 19.17 4.83 20 5.86 20h9.28c1 0 1.86-0.83 1.86-1.86V8.86C17 8 16.17 7 15 7H6zM6 4c0-1.1 1-2 2-2h8a6 6 0 0 1 6 6v0L22 16a2 2 0 0 1-2 2L20 8V8a4 4 0 0 0-4-4H6z"
-      android:fillColor="?primaryText" />
-</vector>
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
+  android:pathData="M17.5556,22L6.4444,22C3.9898,22 2,20.0102 2,17.5556L2,6.4444C2,3.9898 3.9898,2 6.4444,2L17.5556,2C20.0102,2 22,3.9898 22,6.4444L22,17.5556C22,20.0102 20.0102,22 17.5556,22ZM6.5378,4.3529C5.3311,4.3529 4.3529,5.3311 4.3529,6.5378L4.3529,17.4622C4.3529,18.6689 5.3311,19.6471 6.5378,19.6471L17.4622,19.6471C18.6689,19.6471 19.6471,18.6689 19.6471,17.4622L19.6471,6.5378C19.6471,5.3311 18.6689,4.3529 17.4622,4.3529L6.5378,4.3529Z"
+    <path
+        android:strokeWidth="1"
+        android:fillColor="?primaryText"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
index 9338e2702..30fe37d36 100644
--- a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
+++ b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
@@ -5,7 +5,6 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:background="@drawable/mozac_ui_tabcounter_round_rectangle_ripple"
     tools:layout_height="wrap_content"
     tools:layout_width="wrap_content">