Merge "Fix issue with limiting access points"

This commit is contained in:
Irfan Sheriff
2010-10-10 12:22:04 -07:00
committed by Android (Google) Code Review

View File

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