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

---
 .../fenix/search/awesomebar/AwesomeBarView.kt       |  4 ++--
 app/src/main/res/drawable/ic_search.xml             | 13 -------------
 app/src/main/res/layout/fragment_search_dialog.xml  |  2 +-
 app/src/main/res/layout/tab_group_item.xml          |  2 +-
 app/src/main/res/menu/languages_list.xml            |  2 +-
 app/src/main/res/menu/login_list.xml                |  2 +-
 .../mozilla/fenix/search/toolbar/ToolbarViewTest.kt |  2 +-
 7 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_search.xml

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index 55816fee4a..d209661b44 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -148,7 +148,7 @@ class AwesomeBarView(
                 )
             )
 
-        val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
+        val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply {
             colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
         }.toBitmap()
 
@@ -335,7 +335,7 @@ class AwesomeBarView(
             val components = activity.components
             val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText)
 
-            val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
+            val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply {
                 colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
             }.toBitmap()
 
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
deleted file mode 100644
index dd401903ff..0000000000
--- a/app/src/main/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,13 +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:fillColor="?primaryText"
-        android:pathData="M15.685,14.074C16.511,12.925 17,11.519 17,10C17,6.141 13.86,3 10,3C6.14,3 3,6.141 3,10C3,13.859 6.14,17 10,17C11.525,17 12.936,16.508 14.087,15.676L14.611,15.67L19.721,20.78C19.867,20.926 20.059,21 20.251,21C20.443,21 20.635,20.927 20.781,20.78C21.074,20.487 21.074,20.012 20.781,19.719L15.675,14.612L15.685,14.074ZM10,15.5C6.967,15.5 4.5,13.032 4.5,10C4.5,6.968 6.967,4.5 10,4.5C13.033,4.5 15.5,6.968 15.5,10C15.5,13.032 13.033,15.5 10,15.5Z" />
-</vector>
diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml
index d4747c157d..6f510572ab 100644
--- a/app/src/main/res/layout/fragment_search_dialog.xml
+++ b/app/src/main/res/layout/fragment_search_dialog.xml
@@ -186,7 +186,7 @@
         style="@style/search_pill"
         android:textOff="@string/search_engine_button"
         android:textOn="@string/search_engine_button"
-        app:drawableStartCompat="@drawable/ic_search"
+        app:drawableStartCompat="@drawable/mozac_ic_search"
         app:layout_constraintBottom_toBottomOf="@id/pill_wrapper"
         app:layout_constraintStart_toEndOf="@id/qr_scan_button"
         app:layout_constraintTop_toTopOf="@id/pill_wrapper" />
diff --git a/app/src/main/res/layout/tab_group_item.xml b/app/src/main/res/layout/tab_group_item.xml
index 752db3c651..34740d2ef2 100644
--- a/app/src/main/res/layout/tab_group_item.xml
+++ b/app/src/main/res/layout/tab_group_item.xml
@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="@color/primary_text_normal_theme"
-        app:srcCompat="@drawable/ic_search" />
+        app:srcCompat="@drawable/mozac_ic_search" />
 
     <TextView
         android:id="@+id/tab_group_title"
diff --git a/app/src/main/res/menu/languages_list.xml b/app/src/main/res/menu/languages_list.xml
index f3d854c2ca..b8690f2a81 100644
--- a/app/src/main/res/menu/languages_list.xml
+++ b/app/src/main/res/menu/languages_list.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/mozac_ic_search"
         android:title="@string/locale_search_hint"
         app:iconTint="?primaryText"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
diff --git a/app/src/main/res/menu/login_list.xml b/app/src/main/res/menu/login_list.xml
index e6e0c6959c..583d7957f5 100644
--- a/app/src/main/res/menu/login_list.xml
+++ b/app/src/main/res/menu/login_list.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/mozac_ic_search"
         android:title="@string/preferences_passwords_saved_logins_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:iconTint="?primaryText"
diff --git a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
index 48c1eacdda..1b347d2339 100644
--- a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
@@ -44,7 +44,7 @@ class ToolbarViewTest {
         searchEngineSource = SearchEngineSource.Default(
             mockk {
                 every { name } returns "Search Engine"
-                every { icon } returns testContext.getDrawable(R.drawable.ic_search)!!.toBitmap()
+                every { icon } returns testContext.getDrawable(R.drawable.mozac_ic_search)!!.toBitmap()
             }
         ),
         defaultEngine = null,