Merge "Show "disconnected" progress bar on add network flow"

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

View File

@@ -462,6 +462,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
showAddNetworkTitle(); showAddNetworkTitle();
mConnectButton.setVisibility(View.VISIBLE); mConnectButton.setVisibility(View.VISIBLE);
showDisconnectedProgressBar();
showEditingButtonState(); showEditingButtonState();
} else if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) { } else if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
mNetworkName = selectedAccessPoint.getTitle().toString(); mNetworkName = selectedAccessPoint.getTitle().toString();
@@ -471,6 +472,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
} else { } else {
mNetworkName = selectedAccessPoint.getTitle().toString(); mNetworkName = selectedAccessPoint.getTitle().toString();
showEditingTitle(); showEditingTitle();
showDisconnectedProgressBar();
showEditingButtonState(); showEditingButtonState();
if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) { if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
onEapNetworkSelected(); onEapNetworkSelected();