PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix wifi not re-ordering" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-07-10 18:37:19 +00:00
committed by Android (Google) Code Review
parent ddd887afc8 088537a315
commit 7ab3cf944d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiSettings.java
View File

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