Merge "Fix issue with limiting access points"

src/com/android/settings/wifi/WifiSettings.java

@@ -451,6 +451,8 @@ public class WifiSettings extends SettingsPreferenceFragment
             // AccessPoints are automatically sorted with TreeSet.
             final Collection<AccessPoint> accessPoints = constructAccessPoints();
 
+            if (mInXlSetupWizard) {
+                //limit access points on set up wizard
                 int count = MAX_MENU_COUNT_IN_XL;
                 for (AccessPoint accessPoint : accessPoints) {
                     mAccessPoints.addPreference(accessPoint);
@@ -459,6 +461,11 @@ public class WifiSettings extends SettingsPreferenceFragment
                         break;
                     }
                 }
+            } else {
+                for (AccessPoint accessPoint : accessPoints) {
+                    mAccessPoints.addPreference(accessPoint);
+                }
+            }
         }
     }