From 17c7edb7ede672280f7fc8251d58d47a304be499 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sat, 8 Jan 2022 17:20:05 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/23121 - Replace
 @drawble/ic_delete with @drawable/mozac_ic_delete

---
 .../home/sessioncontrol/SwipeToDeleteCallback.kt |  2 +-
 .../viewholders/DownloadsListItemViewHolder.kt   |  2 +-
 .../fenix/tabstray/browser/TabsTouchHelper.kt    |  2 +-
 app/src/main/res/drawable/ic_delete.xml          | 16 ----------------
 app/src/main/res/layout/inactive_header_item.xml |  2 +-
 app/src/main/res/menu/bookmarks_edit.xml         |  2 +-
 app/src/main/res/menu/credit_card_editor.xml     |  2 +-
 app/src/main/res/menu/history_menu.xml           |  2 +-
 app/src/main/res/menu/login_options_menu.xml     |  2 +-
 9 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_delete.xml

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
index 862e319841..bbb0f13a92 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
@@ -44,7 +44,7 @@ class SwipeToDeleteCallback(
         isCurrentlyActive: Boolean
     ) {
         super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-        val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.ic_delete)
+        val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.mozac_ic_delete)
         icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.destructive))
 
         val backgroundDrawable = when {
diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
index eb272e05d0..cf23a13b32 100644
--- a/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
@@ -48,7 +48,7 @@ class DownloadsListItemViewHolder(
 
         librarySiteItemBinding.favicon.setImageResource(item.getIcon())
 
-        librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.ic_delete)
+        librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.mozac_ic_delete)
 
         librarySiteItemBinding.overflowMenu.showAndEnable()
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
index be67b9a990..c036a08fea 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
@@ -84,7 +84,7 @@ class TouchCallback(
         }
 
         val icon = recyclerView.context.getDrawableWithTint(
-            R.drawable.ic_delete,
+            R.drawable.mozac_ic_delete,
             recyclerView.context.getColorFromAttr(R.attr.destructive)
         )!!
         val background = AppCompatResources.getDrawable(
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
deleted file mode 100644
index 016f2ad0b9..0000000000
--- a/app/src/main/res/drawable/ic_delete.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - 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="M20.25,6L16,6L16,4.5A2.5,2.5 0,0 0,13.5 2h-3A2.5,2.5 0,0 0,8 4.5L8,6L3.75,6a0.75,0.75 0,0 0,0 1.5L4,7.5v12A2.5,2.5 0,0 0,6.5 22h11a2.5,2.5 0,0 0,2.5 -2.5v-12h0.25a0.75,0.75 0,0 0,0 -1.5zM9.5,4.3l0.8,-0.8h3.4l0.8,0.8L14.5,6h-5L9.5,4.3zM18.5,19.7 L17.7,20.5L6.3,20.5l-0.8,-0.8L5.5,7.5h13v12.2z"
-      android:fillColor="?primaryText"/>
-  <path
-      android:pathData="M10.5,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0zM15,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0z"
-      android:fillColor="?primaryText"/>
-</vector>
diff --git a/app/src/main/res/layout/inactive_header_item.xml b/app/src/main/res/layout/inactive_header_item.xml
index 6ace4d6a6b..8f872d3323 100644
--- a/app/src/main/res/layout/inactive_header_item.xml
+++ b/app/src/main/res/layout/inactive_header_item.xml
@@ -64,7 +64,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_delete" />
+            app:srcCompat="@drawable/mozac_ic_delete" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bookmarks_edit.xml b/app/src/main/res/menu/bookmarks_edit.xml
index f9a024b3d6..4aa4bd5af7 100644
--- a/app/src/main/res/menu/bookmarks_edit.xml
+++ b/app/src/main/res/menu/bookmarks_edit.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/delete_bookmark_button"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/mozac_ic_delete"
         app:iconTint="?primaryText"
         android:title="@string/bookmark_menu_delete_button"
         android:contentDescription="@string/bookmark_menu_delete_button"
diff --git a/app/src/main/res/menu/credit_card_editor.xml b/app/src/main/res/menu/credit_card_editor.xml
index 5b4c672a2a..fe374b1bcf 100644
--- a/app/src/main/res/menu/credit_card_editor.xml
+++ b/app/src/main/res/menu/credit_card_editor.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/delete_credit_card_button"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/mozac_ic_delete"
         android:title="@string/credit_cards_menu_delete_card"
         android:visible="false"
         app:iconTint="?primaryText"
diff --git a/app/src/main/res/menu/history_menu.xml b/app/src/main/res/menu/history_menu.xml
index 7d8badf265..620a06731d 100644
--- a/app/src/main/res/menu/history_menu.xml
+++ b/app/src/main/res/menu/history_menu.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/history_delete_all"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/mozac_ic_delete"
         android:title="@string/history_delete_all"
         app:iconTint="?primaryText"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/login_options_menu.xml b/app/src/main/res/menu/login_options_menu.xml
index 840c9f50d0..276211c3f4 100644
--- a/app/src/main/res/menu/login_options_menu.xml
+++ b/app/src/main/res/menu/login_options_menu.xml
@@ -25,7 +25,7 @@
     <item
         android:id="@+id/delete_login_button"
         android:contentDescription="@string/login_menu_delete_button"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/mozac_ic_delete"
         android:minWidth="82dp"
         android:padding="20dp"
         android:paddingStart="20dp"