commit fd341fc431e1a9831041a836deaacbd2ee5fa2cb
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 30 00:56:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 30 00:56:29 2021 +0000
tree 08ad1c2441826ede10cd018e582b9e9addbf97af
parent 736998c74e222068a2d3c11897bc6668dc071403
parent 420974aba9bace0b8ede6e4ad9907828cd2c74cb

Merge "Adjust colors on privacy dashboard graphic" into sc-dev am: 420974aba9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/15146890

Change-Id: I1ab1741adb73f93534d1ae46441278703b2e2795

PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java
index a591ad2..28bd3ce 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java
@@ -110,15 +110,10 @@
         centerLabel.setTextAppearance(R.style.PrivacyDashboardGraphicLabel);
 
         // Sample colors.
-        // TODO(b/176902658): Use proper API for sampling these colors.
-        final int colorAccentPrimary = getContext().getColor(
-                android.R.color.system_accent1_300);
-        final int colorAccentPrimaryVariant = getContext().getColor(
-                android.R.color.system_accent1_600);
-        final int colorAccentSecondary = getContext().getColor(
-                android.R.color.system_accent2_300);
-        final int colorAccentTertiary = getContext().getColor(
-                android.R.color.system_accent3_300);
+        final int colorCamera = getContext().getColor(android.R.color.system_accent1_300);
+        final int colorMicrophone = getContext().getColor(android.R.color.system_accent1_100);
+        final int colorLocation = getContext().getColor(android.R.color.system_accent3_100);
+        final int colorOther = getContext().getColor(android.R.color.system_accent2_100);
 
         // Create labels, counts, and colors.
         TextView[] labels;
@@ -129,7 +124,7 @@
             labels = new TextView[] { new TextView(getContext()) };
             labels[0] = null;
             counts = new int[] { 1 };
-            colors = new int[] { colorAccentPrimaryVariant };
+            colors = new int[] { colorOther };
         } else {
             labels = new TextView[] {
                     new TextView(getContext()),
@@ -151,10 +146,10 @@
                             Manifest.permission_group.LOCATION) : 0
             };
             colors = new int[] {
-                    colorAccentSecondary,
-                    colorAccentPrimary,
-                    colorAccentTertiary,
-                    colorAccentPrimaryVariant
+                    colorCamera,
+                    colorMicrophone,
+                    colorLocation,
+                    colorOther
             };
         }