From 1b93c299fa3d70110ce185aca7eb5eae79bb20c2 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Mon, 26 Jun 2023 02:12:18 -0400 Subject: [PATCH] Bug 1840210 - Rename mozac_ic_shield to mozac_ic_shield_24 --- .../main/res/drawable/{mozac_ic_shield.xml => mozac_ic_shield_24.xml} | 0 .../mozilla/focus/browser/integration/BrowserToolbarIntegration.kt | 4 ++-- .../org/mozilla/focus/settings/privacy/TrackingProtectionPanel.kt | 2 +- .../src/main/java/org/mozilla/focus/widget/SwitchWithDescription.kt | 2 +- .../app/src/main/res/layout/dialog_tracking_protection_sheet.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename mobile/android/android-components/components/ui/icons/src/main/res/drawable/{mozac_ic_shield.xml => mozac_ic_shield_24.xml} (100%) diff --git a/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_shield.xml b/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_shield_24.xml similarity index 100% rename from mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_shield.xml rename to mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_shield_24.xml diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt index f588c67f266a..a33b7830a2b1 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt @@ -150,11 +150,11 @@ class BrowserToolbarIntegration( icons = icons.copy( trackingProtectionTrackersBlocked = AppCompatResources.getDrawable( context, - R.drawable.mozac_ic_shield, + R.drawable.mozac_ic_shield_24, )!!, trackingProtectionNothingBlocked = AppCompatResources.getDrawable( context, - R.drawable.mozac_ic_shield, + R.drawable.mozac_ic_shield_24, )!!, trackingProtectionException = AppCompatResources.getDrawable( context, 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 617d50101b53..e291aef2fc7f 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 @@ -143,7 +143,7 @@ class TrackingProtectionPanel( } val icon = if (isTrackingProtectionOn) { - R.drawable.mozac_ic_shield + R.drawable.mozac_ic_shield_24 } else { R.drawable.mozac_ic_shield_disabled } diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/widget/SwitchWithDescription.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/widget/SwitchWithDescription.kt index 3402538e1997..d726fa20f37a 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/widget/SwitchWithDescription.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/widget/SwitchWithDescription.kt @@ -30,7 +30,7 @@ class SwitchWithDescription @JvmOverloads constructor( context.withStyledAttributes(attrs, R.styleable.SwitchWithDescription, defStyleAttr, 0) { val icon = getResourceId( R.styleable.SwitchWithDescription_switchIcon, - R.drawable.mozac_ic_shield, + R.drawable.mozac_ic_shield_24, ) val switchTitle = resources.getString( 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 14ec498e2458..6d31216a1086 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 @@ -67,7 +67,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cookie_banner_exception" app:switchDescription="@string/enhanced_tracking_protection_state_on" - app:switchIcon="@drawable/mozac_ic_shield" + app:switchIcon="@drawable/mozac_ic_shield_24" app:switchTitle="@string/enhanced_tracking_protection" />