From 011d02b2a5680b6b0eaa1355bebcb006a05672c3 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Wed, 7 Apr 2021 11:02:37 +0800 Subject: Show colorAccent icon color for connected Wi-Fi entry - Screenshot: https://screenshot.googleplex.com/9Mud8BPjvSEyo2Q Bug: 177481238 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest Change-Id: I637a38e7acfa8a330e88860743be63417e5a8187 --- .../src/com/android/settingslib/wifi/WifiEntryPreference.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java index aad0d3af6626..9889419fb288 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java @@ -186,6 +186,10 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt // TODO(b/70983952): Fill this method in } + protected int getIconColorAttr() { + return (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) + ? android.R.attr.colorAccent : android.R.attr.colorControlNormal; + } private void updateIcon(boolean showX, int level) { if (level == -1) { @@ -195,8 +199,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt final Drawable drawable = mIconInjector.getIcon(showX, level); if (drawable != null) { - drawable.setTintList(Utils.getColorAttr(getContext(), - android.R.attr.colorControlNormal)); + drawable.setTint(Utils.getColorAttrDefaultColor(getContext(), getIconColorAttr())); setIcon(drawable); } else { setIcon(null); -- cgit v1.2.3-59-g8ed1b