From 7e348314559ee4f562c77ee8e7e7e69fb797bd0f Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sat, 24 Jun 2023 14:22:52 -0400
Subject: [PATCH] Bug 1840210 - Rename mozac_ic_lock to mozac_ic_lock_24

---
 .../browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml    | 2 +-
 .../main/res/layout/mozac_feature_prompt_save_credit_card_prompt.xml    | 2 +-
 .../src/main/res/drawable/{mozac_ic_lock.xml => mozac_ic_lock_24.xml}   | 0
 .../test/java/mozilla/components/ui/widgets/WidgetSiteItemViewTest.kt   | 2 +-
 .../fenix/app/src/main/res/layout/connection_details_website_info.xml   | 2 +-
 .../fenix/app/src/main/res/layout/quicksettings_website_info.xml        | 2 +-
 .../java/org/mozilla/focus/settings/privacy/ConnectionDetailsPanel.kt   | 2 +-
 .../java/org/mozilla/focus/settings/privacy/TrackingProtectionPanel.kt  | 2 +-
 .../focus-android/app/src/main/res/layout/connection_details.xml        | 2 +-
 .../app/src/main/res/layout/dialog_tracking_protection_sheet.xml        | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename mobile/android/android-components/components/ui/icons/src/main/res/drawable/{mozac_ic_lock.xml => mozac_ic_lock_24.xml} (100%)

diff --git a/mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml b/mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml
index 61ddef55f086..ab2b8d0e37f0 100644
--- a/mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml
+++ b/mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ac="http://schemas.android.com/apk/res-auto">
     <item
-        android:drawable="@drawable/mozac_ic_lock"
+        android:drawable="@drawable/mozac_ic_lock_24"
         ac:state_site_secure="true" />
     <item
         android:drawable="@drawable/mozac_ic_broken_lock" />
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/layout/mozac_feature_prompt_save_credit_card_prompt.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/layout/mozac_feature_prompt_save_credit_card_prompt.xml
index 607a01347391..03bb4d9a83c0 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/layout/mozac_feature_prompt_save_credit_card_prompt.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/layout/mozac_feature_prompt_save_credit_card_prompt.xml
@@ -20,7 +20,7 @@
         android:layout_height="24dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_lock"
+        app:srcCompat="@drawable/mozac_ic_lock_24"
         app:tint="?android:attr/textColorPrimary"
         android:importantForAccessibility="no" />
 
diff --git a/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_lock.xml b/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_lock_24.xml
similarity index 100%
rename from mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_lock.xml
rename to mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_lock_24.xml
diff --git a/mobile/android/android-components/components/ui/widgets/src/test/java/mozilla/components/ui/widgets/WidgetSiteItemViewTest.kt b/mobile/android/android-components/components/ui/widgets/src/test/java/mozilla/components/ui/widgets/WidgetSiteItemViewTest.kt
index f8f01537e600..babc038dc0d5 100644
--- a/mobile/android/android-components/components/ui/widgets/src/test/java/mozilla/components/ui/widgets/WidgetSiteItemViewTest.kt
+++ b/mobile/android/android-components/components/ui/widgets/src/test/java/mozilla/components/ui/widgets/WidgetSiteItemViewTest.kt
@@ -70,7 +70,7 @@ class WidgetSiteItemViewTest {
         val secondaryButton = view.findViewById<ImageButton>(R.id.secondary_button)
         var clicked = false
         view.setSecondaryButton(
-            icon = iconsR.drawable.mozac_ic_lock,
+            icon = iconsR.drawable.mozac_ic_lock_24,
             contentDescription = iconsR.string.mozac_error_lock,
             onClickListener = { clicked = true },
         )
diff --git a/mobile/android/fenix/app/src/main/res/layout/connection_details_website_info.xml b/mobile/android/fenix/app/src/main/res/layout/connection_details_website_info.xml
index 6ee3302ad18e..0ebfb6386eb5 100644
--- a/mobile/android/fenix/app/src/main/res/layout/connection_details_website_info.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/connection_details_website_info.xml
@@ -78,7 +78,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
-                app:srcCompat="@drawable/mozac_ic_lock"/>
+                app:srcCompat="@drawable/mozac_ic_lock_24"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/mobile/android/fenix/app/src/main/res/layout/quicksettings_website_info.xml b/mobile/android/fenix/app/src/main/res/layout/quicksettings_website_info.xml
index 4c54e43318c5..620d7b910cbd 100644
--- a/mobile/android/fenix/app/src/main/res/layout/quicksettings_website_info.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/quicksettings_website_info.xml
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
-            app:srcCompat="@drawable/mozac_ic_lock"/>
+            app:srcCompat="@drawable/mozac_ic_lock_24"/>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/ConnectionDetailsPanel.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/ConnectionDetailsPanel.kt
index 4c3080b866fd..85058eee2316 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/ConnectionDetailsPanel.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/ConnectionDetailsPanel.kt
@@ -60,7 +60,7 @@ class ConnectionDetailsPanel(
         }
 
         val securityIcon = if (isConnectionSecure) {
-            AppCompatResources.getDrawable(context, R.drawable.mozac_ic_lock)
+            AppCompatResources.getDrawable(context, R.drawable.mozac_ic_lock_24)
         } else {
             AppCompatResources.getDrawable(context, R.drawable.mozac_ic_warning)
         }
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/TrackingProtectionPanel.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/TrackingProtectionPanel.kt
index 004c73627b7a..617d50101b53 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/TrackingProtectionPanel.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/settings/privacy/TrackingProtectionPanel.kt
@@ -122,7 +122,7 @@ class TrackingProtectionPanel(
         val nextIcon = AppCompatResources.getDrawable(context, R.drawable.mozac_ic_chevron_right_24)
 
         val securityIcon = if (isConnectionSecure) {
-            AppCompatResources.getDrawable(context, R.drawable.mozac_ic_lock)
+            AppCompatResources.getDrawable(context, R.drawable.mozac_ic_lock_24)
         } else {
             AppCompatResources.getDrawable(context, R.drawable.mozac_ic_warning)
         }
diff --git a/mobile/android/focus-android/app/src/main/res/layout/connection_details.xml b/mobile/android/focus-android/app/src/main/res/layout/connection_details.xml
index 8835cc167b8f..c59ff6da90ee 100644
--- a/mobile/android/focus-android/app/src/main/res/layout/connection_details.xml
+++ b/mobile/android/focus-android/app/src/main/res/layout/connection_details.xml
@@ -79,7 +79,7 @@
         android:gravity="center_vertical"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        app:drawableStartCompat="@drawable/mozac_ic_lock"
+        app:drawableStartCompat="@drawable/mozac_ic_lock_24"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/site_favicon"
diff --git a/mobile/android/focus-android/app/src/main/res/layout/dialog_tracking_protection_sheet.xml b/mobile/android/focus-android/app/src/main/res/layout/dialog_tracking_protection_sheet.xml
index 7d1c4fdb4cf4..14ec498e2458 100644
--- a/mobile/android/focus-android/app/src/main/res/layout/dialog_tracking_protection_sheet.xml
+++ b/mobile/android/focus-android/app/src/main/res/layout/dialog_tracking_protection_sheet.xml
@@ -45,7 +45,7 @@
             android:drawablePadding="20dp"
             android:gravity="center_vertical"
             app:drawableEndCompat="@drawable/mozac_ic_chevron_right_24"
-            app:drawableStartCompat="@drawable/mozac_ic_lock"
+            app:drawableStartCompat="@drawable/mozac_ic_lock_24"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/site_title"
             tools:text="@string/secure_connection" />
-- 
2.11.4.GIT