am d5c8980a: am 8b35321f: am 93623850: am c07450ae: am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev

* commit 'd5c8980a3b270ed9ebad365773417f9338252ef0':
  Fix wifi not re-ordering
This commit is contained in:
Jason Monk
2015-07-10 19:47:03 +00:00
committed by Android Git Automerger

View File

@@ -653,16 +653,20 @@ public class WifiSettings extends RestrictedSettingsFragment
getPreferenceScreen().removeAll();
boolean hasAvailableAccessPoints = false;
int index = 0;
for (AccessPoint accessPoint : accessPoints) {
// Ignore access points that are out of range.
if (accessPoint.getLevel() != -1) {
hasAvailableAccessPoints = true;
if (accessPoint.getTag() != null) {
getPreferenceScreen().addPreference((Preference) accessPoint.getTag());
final Preference pref = (Preference) accessPoint.getTag();
pref.setOrder(index++);
getPreferenceScreen().addPreference(pref);
continue;
}
AccessPointPreference preference = new AccessPointPreference(accessPoint,
getActivity(), mUserBadgeCache, false);
preference.setOrder(index++);
if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
&& !accessPoint.isSaved()