Merge "Show colorAccent icon color for connected Wi-Fi entry" into sc-dev

1 files 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);