Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use same color for all indicators

Browse Source 
Test: manual
Fixes: 183610078
Change-Id: Iaa7cd5c923a4cf724a7b1ae1e4342c2eba934ab9
This commit is contained in:
Fabian Kozynski
2021-03-24 12:49:17 -04:00
parent d6a0393fe0
commit 09836c5057
7 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/privacy_chip_bg.xml
View File

@@ -16,6 +16,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFFFFF" />
<solid android:color="@color/privacy_circle" />
<corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />
</shape>

2
packages/SystemUI/res/drawable/privacy_item_circle_camera.xml
View File

@@ -24,7 +24,7 @@
android:height="@dimen/ongoing_appops_dialog_circle_size"
android:width="@dimen/ongoing_appops_dialog_circle_size"
/>
<solid android:color="@color/privacy_circle_camera" />
<solid android:color="@color/privacy_circle" />
</shape>
</item>
<item android:id="@id/icon"

2
packages/SystemUI/res/drawable/privacy_item_circle_location.xml
View File

@@ -24,7 +24,7 @@
android:height="@dimen/ongoing_appops_dialog_circle_size"
android:width="@dimen/ongoing_appops_dialog_circle_size"
/>
<solid android:color="@color/privacy_circle_microphone_location" />
<solid android:color="@color/privacy_circle" />
</shape>
</item>
<item android:id="@id/icon"

2
packages/SystemUI/res/drawable/privacy_item_circle_microphone.xml
View File

@@ -24,7 +24,7 @@
android:height="@dimen/ongoing_appops_dialog_circle_size"
android:width="@dimen/ongoing_appops_dialog_circle_size"
/>
<solid android:color="@color/privacy_circle_microphone_location" />
<solid android:color="@color/privacy_circle" />
</shape>
</item>
<item android:id="@id/icon"

3
packages/SystemUI/res/values-night/colors.xml
View File

@@ -99,8 +99,7 @@
<color name="qs_user_switcher_avatar_background">#3C4043</color>
<!-- Colors for privacy dialog. These should be changed to the new palette -->
<color name="privacy_circle_camera">#81C995</color> <!-- g300 -->
<color name="privacy_circle_microphone_location">#FCAD70</color> <!--o300 -->
<color name="privacy_circle">#81C995</color> <!-- g300 -->
<!-- Accessibility floating menu -->
<color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->

3
packages/SystemUI/res/values/colors.xml
View File

@@ -272,8 +272,7 @@
<color name="screenrecord_status_color">#E94235</color>
<!-- TODO(b/178093014) Colors for privacy dialog. These should be changed to the new palette -->
<color name="privacy_circle_camera">#1E8E3E</color> <!-- g600 -->
<color name="privacy_circle_microphone_location">#E8710A</color> <!--o600 -->
<color name="privacy_circle">#1E8E3E</color> <!-- g600 -->
<!-- Accessibility floating menu -->
<color name="accessibility_floating_menu_background">#CCFFFFFF</color> <!-- 80% -->

9
packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt
View File

@@ -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)