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

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14097781

Change-Id: I08cb5f892b361a782fb2d9ab0a4dfe6ce5abc82b
This commit is contained in:
TreeHugger Robot
2021-04-09 05:13:25 +00:00
committed by Automerger Merge Worker
parent 4f8c860ab8 e08ddd5fe2
commit c6312f7b77
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
View File

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