Merge "Show friction icons in Saved Networks list." (8c97bcc9) · Commits · e / os / android_frameworks_base

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

+3 −13

Original line number	Diff line number	Diff line
		@@ -43,10 +43,6 @@ public class AccessPointPreference extends Preference {
		private static final int[] STATE_SECURED = {
		R.attr.state_encrypted
		};
		private static final int[] STATE_SAVED = {
		R.attr.state_encrypted,
		R.attr.state_saved
		};

		private static final int[] wifi_friction_attributes = { R.attr.wifi_friction };

		@@ -152,11 +148,9 @@ public class AccessPointPreference extends Preference {
		}
		view.itemView.setContentDescription(mContentDescription);

		if (!mForSavedNetworks) {
		ImageView frictionImageView = (ImageView) view.findViewById(R.id.friction_icon);
		bindFrictionImage(frictionImageView);
		}
		}

		protected void updateIcon(int level, Context context) {
		if (level == -1) {
		@@ -184,12 +178,8 @@ public class AccessPointPreference extends Preference {
		return;
		}
		if (mAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
		if (mAccessPoint.isSaved()) {
		mFrictionSld.setState(STATE_SAVED);
		} else {
		mFrictionSld.setState(STATE_SECURED);
		}
		}
		Drawable drawable = mFrictionSld.getCurrent();
		frictionImageView.setImageDrawable(drawable);
		}