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

Merge "Show friction icons in Saved Networks list."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-17 23:06:09 +00:00
committed by Android (Google) Code Review
parent 0843c57978 4d8781e6be
commit 8c97bcc9fe
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
View File

@@ -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,10 +148,8 @@ public class AccessPointPreference extends Preference {
}
view.itemView.setContentDescription(mContentDescription);
if (!mForSavedNetworks) {
ImageView frictionImageView = (ImageView) view.findViewById(R.id.friction_icon);
bindFrictionImage(frictionImageView);
}
ImageView frictionImageView = (ImageView) view.findViewById(R.id.friction_icon);
bindFrictionImage(frictionImageView);
}
protected void updateIcon(int level, Context context) {
@@ -184,11 +178,7 @@ public class AccessPointPreference extends Preference {
return;
}
if (mAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
if (mAccessPoint.isSaved()) {
mFrictionSld.setState(STATE_SAVED);
} else {
mFrictionSld.setState(STATE_SECURED);
}
mFrictionSld.setState(STATE_SECURED);
}
Drawable drawable = mFrictionSld.getCurrent();
frictionImageView.setImageDrawable(drawable);