Merge "[Wi-Fi] Remove $ icon for metered Wi-Fi networks" into rvc-dev am: 71b352b211 am: 08ffebce65 (96e94dd5) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -43,10 +43,6 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
	R.attr.state_encrypted		R.attr.state_encrypted
	};		};

	private static final int[] STATE_METERED = {
	R.attr.state_metered
	};

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