diff --git a/packages/SystemUI/res/drawable/privacy_chip_bg.xml b/packages/SystemUI/res/drawable/privacy_chip_bg.xml index 109442d7ed796..9f41dbeae765e 100644 --- a/packages/SystemUI/res/drawable/privacy_chip_bg.xml +++ b/packages/SystemUI/res/drawable/privacy_chip_bg.xml @@ -16,6 +16,6 @@ --> - + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/privacy_item_circle_camera.xml b/packages/SystemUI/res/drawable/privacy_item_circle_camera.xml index 5cb6f4626b36f..54a66e26169c6 100644 --- a/packages/SystemUI/res/drawable/privacy_item_circle_camera.xml +++ b/packages/SystemUI/res/drawable/privacy_item_circle_camera.xml @@ -24,7 +24,7 @@ android:height="@dimen/ongoing_appops_dialog_circle_size" android:width="@dimen/ongoing_appops_dialog_circle_size" /> - + - + - + #3C4043 - #81C995 - #FCAD70 + #81C995 #B3000000 diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index a773b2242eaab..4e3e64ac79f4b 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -272,8 +272,7 @@ #E94235 - #1E8E3E - #E8710A + #1E8E3E #CCFFFFFF diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt index bdd37fc521fa0..9cd97ff8e3431 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt @@ -33,8 +33,6 @@ class OngoingPrivacyChip @JvmOverloads constructor( private var iconMargin = 0 private var iconSize = 0 private var iconColor = 0 - private var defaultBackgroundColor = 0 - private var cameraBackgroundColor = 0 private lateinit var iconsContainer: LinearLayout @@ -75,11 +73,6 @@ class OngoingPrivacyChip @JvmOverloads constructor( if (!privacyList.isEmpty()) { generateContentDescription(builder) setIcons(builder, iconsContainer) - if (builder.types.contains(PrivacyType.TYPE_CAMERA)) { - iconsContainer.background.setTint(cameraBackgroundColor) - } else { - iconsContainer.background.setTint(defaultBackgroundColor) - } } else { iconsContainer.removeAllViews() } @@ -99,8 +92,6 @@ class OngoingPrivacyChip @JvmOverloads constructor( .getDimensionPixelSize(R.dimen.ongoing_appops_chip_icon_size) iconColor = Utils.getColorAttrDefaultColor(context, com.android.internal.R.attr.colorPrimary) - defaultBackgroundColor = context.getColor(R.color.privacy_circle_microphone_location) - cameraBackgroundColor = context.getColor(R.color.privacy_circle_camera) val padding = context.resources .getDimensionPixelSize(R.dimen.ongoing_appops_chip_side_padding)