From bbc835ad02057eb2b09923713f88459e515cb3d0 Mon Sep 17 00:00:00 2001
From: mike a <mavduevskiy@gmail.com>
Date: Fri, 15 Jul 2022 10:37:02 -0700
Subject: [PATCH] Closes #25952: update close icon, start using close_20 on
 smaller ui elements

---
 app/src/main/res/drawable/ic_close.xml                   | 2 +-
 app/src/main/res/layout/download_dialog_layout.xml       | 2 +-
 app/src/main/res/layout/no_collections_message.xml       | 3 ++-
 app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml | 2 +-
 app/src/main/res/layout/onboarding_jump_back_in_cfr.xml  | 2 +-
 app/src/main/res/layout/tab_tray_grid_item.xml           | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index d811dde28..013857fa7 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/textPrimary"
-        android:pathData="M13.108 11.776l4.709-4.709c0.244-0.244 0.244-0.641 0-0.885s-0.64-0.244-0.884 0l-4.689 4.689h-0.488L7.067 6.183c-0.244-0.244-0.64-0.244-0.884 0s-0.244 0.641 0 0.885l4.687 4.686v0.491l-4.687 4.687c-0.244 0.244-0.244 0.641 0 0.885C6.305 17.939 6.465 18 6.625 18c0.16 0 0.32-0.061 0.442-0.183l4.687-4.687h0.491l4.687 4.687C17.055 17.939 17.215 18 17.375 18c0.16 0 0.32-0.061 0.442-0.183 0.244-0.244 0.244-0.641 0-0.885l-4.709-4.709v-0.447z" />
+        android:pathData="M10.367 12.573L4.22002 18.72C3.92702 19.013 3.92702 19.488 4.22002 19.781C4.36602 19.927 4.55802 20 4.75002 20C4.94202 20 5.13402 19.927 5.28002 19.78L11.436 13.624H12.563L18.719 19.78C18.865 19.926 19.057 20 19.249 20C19.441 20 19.633 19.927 19.779 19.78C20.072 19.487 20.072 19.012 19.779 18.719L13.632 12.572L13.633 11.426L19.78 5.28C20.073 4.987 20.073 4.512 19.78 4.219C19.487 3.926 19.012 3.926 18.719 4.219L12.563 10.375H11.435L5.28002 4.22C4.98702 3.927 4.51202 3.927 4.21902 4.22C3.92602 4.513 3.92602 4.988 4.21902 5.281L10.365 11.427L10.367 12.573Z" />
 </vector>
diff --git a/app/src/main/res/layout/download_dialog_layout.xml b/app/src/main/res/layout/download_dialog_layout.xml
index dbdc0a50c..ce30bc3b4 100644
--- a/app/src/main/res/layout/download_dialog_layout.xml
+++ b/app/src/main/res/layout/download_dialog_layout.xml
@@ -50,7 +50,7 @@
         android:contentDescription="@string/mozac_feature_downloads_button_close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close"
+        app:srcCompat="@drawable/mozac_ic_close_20"
         app:tint="?attr/textPrimary" />
 
     <TextView
diff --git a/app/src/main/res/layout/no_collections_message.xml b/app/src/main/res/layout/no_collections_message.xml
index 377d9848f..a4f5824c7 100644
--- a/app/src/main/res/layout/no_collections_message.xml
+++ b/app/src/main/res/layout/no_collections_message.xml
@@ -36,7 +36,8 @@
         app:layout_constraintBottom_toBottomOf="@id/no_collections_header"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/no_collections_header"
-        app:srcCompat="@drawable/ic_close" />
+        app:srcCompat="@drawable/mozac_ic_close_20"
+        app:tint="?attr/textPrimary" />
 
     <TextView
         android:id="@+id/no_collections_description"
diff --git a/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml b/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml
index 0d5fa8ddb..caed08477 100644
--- a/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml
+++ b/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml
@@ -54,7 +54,7 @@
             android:contentDescription="@string/content_description_close_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_close"
+            app:srcCompat="@drawable/mozac_ic_close_20"
             app:tint="@color/fx_mobile_private_text_color_primary" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
index 0f004e5bc..7396fafa6 100644
--- a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
+++ b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
@@ -44,7 +44,7 @@
             android:contentDescription="@string/content_description_close_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_close"
+            app:srcCompat="@drawable/mozac_ic_close_20"
             app:tint="@color/fx_mobile_private_text_color_primary" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/tab_tray_grid_item.xml b/app/src/main/res/layout/tab_tray_grid_item.xml
index 7da9c2c9d..9653e9161 100644
--- a/app/src/main/res/layout/tab_tray_grid_item.xml
+++ b/app/src/main/res/layout/tab_tray_grid_item.xml
@@ -77,7 +77,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
                 app:layout_constraintBottom_toTopOf="@+id/horizonatal_divider"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_close"
+                app:srcCompat="@drawable/mozac_ic_close_20"
                 app:tint="@color/fx_mobile_text_color_primary" />
 
             <View