Merge "Handle "scanning" status correctly"

This commit is contained in:
Daisuke Miyakawa
2011-03-07 19:21:22 -08:00
committed by Android (Google) Code Review

View File

@@ -272,18 +272,16 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
switch (state) { switch (state) {
case SCANNING: { case SCANNING: {
// Let users know the device is working correctly though currently there's if (mScreenState == SCREEN_STATE_DISCONNECTED) {
// no visible network on the list. if (mWifiSettings.getAccessPointsCount() == 0) {
if (mWifiSettings.getAccessPointsCount() == 0) { showScanningState();
showScanningState(); } else {
} else { showDisconnectedProgressBar();
// Users already see available networks.
showDisconnectedProgressBar();
if (mScreenState == SCREEN_STATE_DISCONNECTED &&
mWifiSettings.getAccessPointsCount() > 0) {
mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE); mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
mBottomPadding.setVisibility(View.GONE); mBottomPadding.setVisibility(View.GONE);
} }
} else {
showDisconnectedProgressBar();
} }
break; break;
} }