For mozilla-mobile#23121 - Replace @drawble/ic_search with @drawable/…

…mozac_ic_search
gexsi · Mar 9, 2022 · 933526f · 933526f
1 parent e270d7b
commit 933526f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 20 deletions.
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
@@ -155,7 +155,8 @@ 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()
 
@@ -373,7 +374,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
diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml
@@ -187,7 +187,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
@@ -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
@@ -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
@@ -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
@@ -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,