From e784cc04bcc1a8502051051b976542a1aa1f0907 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Mon, 26 Jun 2023 01:50:22 -0400 Subject: [PATCH] Bug 1840210 - Rename mozac_ic_video to mozac_ic_camera_24 --- .../components/feature/media/middleware/RecordingDevicesMiddleware.kt | 4 ++-- .../components/feature/sitepermissions/SitePermissionsFeature.kt | 2 +- .../main/res/drawable/{mozac_ic_video.xml => mozac_ic_camera_24.xml} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename mobile/android/android-components/components/ui/icons/src/main/res/drawable/{mozac_ic_video.xml => mozac_ic_camera_24.xml} (100%) diff --git a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/middleware/RecordingDevicesMiddleware.kt b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/middleware/RecordingDevicesMiddleware.kt index 9f5f58ae21b1..90eb83fe24cc 100644 --- a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/middleware/RecordingDevicesMiddleware.kt +++ b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/middleware/RecordingDevicesMiddleware.kt @@ -132,12 +132,12 @@ internal sealed class RecordingState { get() = this !is None object CameraAndMicrophone : RecordingState() { - override val iconResource = iconsR.drawable.mozac_ic_video + override val iconResource = iconsR.drawable.mozac_ic_camera_24 override val titleResource = R.string.mozac_feature_media_sharing_camera_and_microphone } object Camera : RecordingState() { - override val iconResource = iconsR.drawable.mozac_ic_video + override val iconResource = iconsR.drawable.mozac_ic_camera_24 override val titleResource = R.string.mozac_feature_media_sharing_camera } diff --git a/mobile/android/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsFeature.kt b/mobile/android/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsFeature.kt index 0df05865989b..6b3f7549c341 100644 --- a/mobile/android/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsFeature.kt +++ b/mobile/android/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/SitePermissionsFeature.kt @@ -794,7 +794,7 @@ class SitePermissionsFeature( host, permissionRequest, R.string.mozac_feature_sitepermissions_camera_title, - iconsR.drawable.mozac_ic_video, + iconsR.drawable.mozac_ic_camera_24, showDoNotAskAgainCheckBox = shouldShowDoNotAskAgainCheckBox, shouldSelectRememberChoice = dialogConfig?.shouldPreselectDoNotAskAgain ?: DialogConfig.DEFAULT_PRESELECT_DO_NOT_ASK_AGAIN, diff --git a/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_video.xml b/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_camera_24.xml similarity index 100% rename from mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_video.xml rename to mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_camera_24.xml -- 2.11.4.GIT