From 4e98bc19f061bb2cf05a019fb8a12b457dc3f90e Mon Sep 17 00:00:00 2001 From: ykhung Date: Mon, 22 Aug 2022 15:55:47 +0800 Subject: [PATCH] Resolve insufficient contrast for system component icons Screenshots: https://screenshot.googleplex.com/5UE5aPgHHBqkpHr https://screenshot.googleplex.com/8yYqPusm9M2euSj Bug: 242989982 Test: manually checking for icon UI Change-Id: Ic3e51dd4d0bc042c9caba78a89f5fe6a4b995efb --- res/drawable/ic_cellular_1_bar.xml | 10 +++---- res/drawable/ic_power_system.xml | 6 ++-- res/drawable/ic_settings_aod.xml | 20 ++++++------- res/drawable/ic_settings_bluetooth.xml | 25 ++++++++++++++++ res/drawable/ic_settings_camera.xml | 6 ++-- res/drawable/ic_settings_display.xml | 6 ++-- res/drawable/ic_settings_phone_idle.xml | 10 +++---- res/drawable/ic_settings_voice_calls.xml | 10 +++---- .../ic_settings_wireless_no_theme.xml | 30 +++++++++++++++++++ res/values-night/colors.xml | 3 ++ res/values/colors.xml | 3 ++ .../BatteryChartPreferenceController.java | 3 ++ .../fuelgauge/batteryusage/BatteryEntry.java | 4 +-- .../batteryusage/BatteryEntryTest.java | 4 +-- 14 files changed, 102 insertions(+), 38 deletions(-) create mode 100644 res/drawable/ic_settings_bluetooth.xml create mode 100644 res/drawable/ic_settings_wireless_no_theme.xml diff --git a/res/drawable/ic_cellular_1_bar.xml b/res/drawable/ic_cellular_1_bar.xml index 23caacc2244..a07e25752fe 100644 --- a/res/drawable/ic_cellular_1_bar.xml +++ b/res/drawable/ic_cellular_1_bar.xml @@ -1,5 +1,5 @@ + + + diff --git a/res/drawable/ic_settings_camera.xml b/res/drawable/ic_settings_camera.xml index 3c855323183..278d29508ce 100644 --- a/res/drawable/ic_settings_camera.xml +++ b/res/drawable/ic_settings_camera.xml @@ -1,5 +1,5 @@ + + + + diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 4e4ee5ddb22..0017c2cb41f 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -52,5 +52,8 @@ @*android:color/ripple_material_light + + + @android:color/white diff --git a/res/values/colors.xml b/res/values/colors.xml index e818a285fe6..7ca1ab2451c 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -209,4 +209,7 @@ ?androidprv:attr/colorSurface + + + ?android:attr/textColorPrimary diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java index e2553ad2f7a..226389b4db3 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java @@ -65,6 +65,8 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll private static final String TAG = "BatteryChartPreferenceController"; private static final String KEY_FOOTER_PREF = "battery_graph_footer"; private static final String PACKAGE_NAME_NONE = "none"; + private static final int ENABLED_ICON_ALPHA = 255; + private static final int DISABLED_ICON_ALPHA = 255 / 3; private static final long VALID_USAGE_TIME_DURATION = DateUtils.HOUR_IN_MILLIS * 2; private static final long VALID_DIFF_DURATION = DateUtils.MINUTE_IN_MILLIS * 3; @@ -463,6 +465,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll if (!isAdded) { mAppListPrefGroup.addPreference(pref); } + appIcon.setAlpha(pref.isEnabled() ? ENABLED_ICON_ALPHA : DISABLED_ICON_ALPHA); prefIndex++; } } diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java index 24d6dad8f88..ccb2fb786eb 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java @@ -574,7 +574,7 @@ public class BatteryEntry { break; case BatteryConsumer.POWER_COMPONENT_BLUETOOTH: name = context.getResources().getString(R.string.power_bluetooth); - iconId = com.android.internal.R.drawable.ic_settings_bluetooth; + iconId = R.drawable.ic_settings_bluetooth; break; case BatteryConsumer.POWER_COMPONENT_CAMERA: name = context.getResources().getString(R.string.power_camera); @@ -598,7 +598,7 @@ public class BatteryEntry { break; case BatteryConsumer.POWER_COMPONENT_WIFI: name = context.getResources().getString(R.string.power_wifi); - iconId = R.drawable.ic_settings_wireless; + iconId = R.drawable.ic_settings_wireless_no_theme; break; case BatteryConsumer.POWER_COMPONENT_IDLE: case BatteryConsumer.POWER_COMPONENT_MEMORY: diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java index 5ca3aca189f..ffc6d9a02e6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java @@ -307,7 +307,7 @@ public class BatteryEntryTest { R.drawable.ic_settings_aod); assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_BLUETOOTH, R.string.power_bluetooth, - com.android.internal.R.drawable.ic_settings_bluetooth); + R.drawable.ic_settings_bluetooth); assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_CAMERA, R.string.power_camera, R.drawable.ic_settings_camera); @@ -325,7 +325,7 @@ public class BatteryEntryTest { R.drawable.ic_settings_display); assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_WIFI, R.string.power_wifi, - R.drawable.ic_settings_wireless); + R.drawable.ic_settings_wireless_no_theme); assertNameAndIcon(BatteryConsumer.POWER_COMPONENT_IDLE, R.string.power_idle, R.drawable.ic_settings_phone_idle);