From 088537a315b74cdcd3ab3201c8de2c79417ebae4 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 10 Jul 2015 13:42:35 -0400
Subject: Fix wifi not re-ordering

Bug: 22361247
Change-Id: I5c25061735628682741060c8a699c0a977c4351b
---
 src/com/android/settings/wifi/WifiSettings.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/com/android/settings/wifi')

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index c32df9d..7ce5dd0 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -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()
-- 
cgit v1.1