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

…ozac_ic_close
gabrielluong · Jan 20, 2022 · 4c89341 · 4c89341
1 parent 0388535
commit 4c89341
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 38 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt
@@ -39,7 +39,7 @@ class CollectionCreationBottomBarView(
 
         iconButton.apply {
             val drawable = context.getDrawableWithTint(
-                R.drawable.ic_close,
+                R.drawable.mozac_ic_close,
                 ContextCompat.getColor(context, R.color.photonWhite)
             )
             setImageDrawable(drawable)

diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
@@ -25,7 +25,7 @@ class ExceptionsListItemViewHolder<T : Any>(
 
     init {
         view.setSecondaryButton(
-            icon = R.drawable.ic_close,
+            icon = R.drawable.mozac_ic_close,
             contentDescription = R.string.history_delete_item
         ) {
             interactor.onDeleteOne(item)

diff --git a/.../main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt b/.../main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
@@ -51,7 +51,7 @@ class TabInCollectionViewHolder(
         }
 
         view.setSecondaryButton(
-            icon = R.drawable.ic_close,
+            icon = R.drawable.mozac_ic_close,
             contentDescription = R.string.remove_tab_from_collection
         ) {
             interactor.onCollectionRemoveTab(collection, tab, wasSwiped = false)

diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
@@ -34,7 +34,7 @@ class HistoryListItemViewHolder(
         }
 
         binding.historyLayout.overflowView.apply {
-            setImageResource(R.drawable.ic_close)
+            setImageResource(R.drawable.mozac_ic_close)
             contentDescription = view.context.getString(R.string.history_delete_item)
             setOnClickListener {
                 val item = item ?: return@setOnClickListener

diff --git a/...java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt b/...java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt
@@ -29,7 +29,7 @@ class HistoryMetadataGroupItemViewHolder(
 
     init {
         binding.historyLayout.overflowView.apply {
-            setImageResource(R.drawable.ic_close)
+            setImageResource(R.drawable.mozac_ic_close)
             contentDescription = view.context.getString(R.string.history_delete_item)
             setOnClickListener {
                 val item = item ?: return@setOnClickListener

diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt
@@ -25,7 +25,7 @@ class RecentlyClosedItemViewHolder(
 
     init {
         binding.historyLayout.overflowView.apply {
-            setImageResource(R.drawable.ic_close)
+            setImageResource(R.drawable.mozac_ic_close)
             contentDescription = view.context.getString(R.string.history_delete_item)
             setOnClickListener {
                 val item = item ?: return@setOnClickListener

diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
diff --git a/app/src/main/res/layout/activity_privacy_content_display.xml b/app/src/main/res/layout/activity_privacy_content_display.xml
@@ -21,7 +21,7 @@
                     android:layout_marginLeft="10dp"
                     android:background="@android:color/transparent"
                     android:id="@+id/privacyContentCloseButton"
-                    android:src="@drawable/ic_close"
+                    android:src="@drawable/mozac_ic_close"
                     android:contentDescription="@string/privacy_content_close_button_content_description"
                     tools:ignore="AndroidSrcXmlDetector" />
 

diff --git a/app/src/main/res/layout/button_tip_item.xml b/app/src/main/res/layout/button_tip_item.xml
@@ -38,7 +38,7 @@
         app:tint="@color/photonLightGrey05"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close" />
+        app:srcCompat="@drawable/mozac_ic_close" />
 
     <TextView
         android:id="@+id/tip_description_text"

diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml
@@ -156,7 +156,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_close"
+            app:srcCompat="@drawable/mozac_ic_close"
             app:tint="?neutral" />
 
         <TextView

diff --git a/app/src/main/res/layout/component_collection_creation_name_collection.xml b/app/src/main/res/layout/component_collection_creation_name_collection.xml
@@ -127,7 +127,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_close"
+            app:srcCompat="@drawable/mozac_ic_close"
             app:tint="?neutral" />
 
         <TextView

diff --git a/app/src/main/res/layout/component_tabstray2.xml b/app/src/main/res/layout/component_tabstray2.xml
@@ -51,7 +51,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/multiselect_title"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/multiselect_title"
-        app:srcCompat="@drawable/ic_close"
+        app:srcCompat="@drawable/mozac_ic_close"
         app:tint="@color/contrast_text_normal_theme" />
 
     <TextView

diff --git 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"
         app:tint="?primaryText" />
 
     <TextView

diff --git a/app/src/main/res/layout/exception_item.xml b/app/src/main/res/layout/exception_item.xml
@@ -53,7 +53,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        app:srcCompat="@drawable/ic_close"
+        app:srcCompat="@drawable/mozac_ic_close"
         android:contentDescription="@string/history_delete_item"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/experiment_default_browser.xml b/app/src/main/res/layout/experiment_default_browser.xml
@@ -19,8 +19,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/description_text"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close"
-        tools:srcCompat="@drawable/ic_close" />
+        app:srcCompat="@drawable/mozac_ic_close"
+        tools:srcCompat="@drawable/mozac_ic_close" />
 
     <TextView
         android:id="@+id/description_text"

diff --git a/app/src/main/res/layout/inactive_tabs_auto_close.xml b/app/src/main/res/layout/inactive_tabs_auto_close.xml
@@ -48,7 +48,7 @@
                 android:contentDescription="@string/tab_tray_inactive_auto_close_button_content_description"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_close" />
+                app:srcCompat="@drawable/mozac_ic_close" />
 
             <TextView
                 android:id="@+id/message"

diff --git a/app/src/main/res/layout/no_collections_message.xml b/app/src/main/res/layout/no_collections_message.xml
@@ -36,7 +36,7 @@
         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" />
 
     <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
@@ -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"
             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
@@ -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"
             app:tint="@color/fx_mobile_private_text_color_primary" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/app/src/main/res/layout/share_close.xml b/app/src/main/res/layout/share_close.xml
@@ -24,7 +24,7 @@
         app:iconTint="@color/neutral_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close" />
+        app:srcCompat="@drawable/mozac_ic_close" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"

diff --git a/app/src/main/res/layout/survey_inactive_tabs_disable.xml b/app/src/main/res/layout/survey_inactive_tabs_disable.xml
@@ -96,7 +96,7 @@
         android:paddingBottom="20dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close" />
+        app:srcCompat="@drawable/mozac_ic_close" />
 
     <Button
         android:id="@+id/send_button"

diff --git 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"
                 app:tint="@color/primary_text_normal_theme" />
 
             <View

diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
@@ -103,7 +103,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close"
+        app:srcCompat="@drawable/mozac_ic_close"
         app:tint="@color/primary_text_normal_theme" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/bookmarks_menu.xml b/app/src/main/res/menu/bookmarks_menu.xml
@@ -13,7 +13,7 @@
 
     <item
         android:id="@+id/close_bookmarks"
-        android:icon="@drawable/ic_close"
+        android:icon="@drawable/mozac_ic_close"
         app:iconTint="?primaryText"
         android:title="@string/content_description_close_button"
         app:showAsAction="ifRoom" />

diff --git a/app/src/main/res/menu/library_menu.xml b/app/src/main/res/menu/library_menu.xml
@@ -7,7 +7,7 @@
 
     <item
         android:id="@+id/close_history"
-        android:icon="@drawable/ic_close"
+        android:icon="@drawable/mozac_ic_close"
         app:iconTint="?primaryText"
         android:title="@string/content_description_close_button"
         app:showAsAction="ifRoom" />