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

Merge "[Wi-Fi] Remove $ icon for metered Wi-Fi networks" into rvc-dev am: 71b352b211 am: 08ffebce65 am: 28423cb373

Browse Source 
Change-Id: I0729b3c304465bb571408b295526d8f6c8a2a7bd
This commit is contained in:
Automerger Merge Worker
2020-03-07 09:57:27 +00:00
parent 25825b98c0 28423cb373
commit ab5e806a5f
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,10 +43,6 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
R.attr.state_encrypted
};
private static final int[] STATE_METERED = {
R.attr.state_metered
};
private static final int[] FRICTION_ATTRS = {
R.attr.wifi_friction
};
@@ -201,8 +197,6 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
if ((mWifiEntry.getSecurity() != WifiEntry.SECURITY_NONE)
&& (mWifiEntry.getSecurity() != WifiEntry.SECURITY_OWE)) {
mFrictionSld.setState(STATE_SECURED);
} else if (mWifiEntry.isMetered()) {
mFrictionSld.setState(STATE_METERED);
}
frictionImageView.setImageDrawable(mFrictionSld.getCurrent());
}