summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-03-07 16:07:43 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-07 16:07:43 -0800
commit4eb13d06b61e1c36b18f1dd615a149ebc29617c4 (patch)
tree255f02453f77749c755e2396fa3f20bda2be6cd0
parentf3b5a4620afd99aa6dd130fff338f5a68f8d90b3 (diff)
parentffce5dabbb8ad5cc441181241e84cf1a03233e20 (diff)
downloadpackages_apps_settings-4eb13d06b61e1c36b18f1dd615a149ebc29617c4.zip
packages_apps_settings-4eb13d06b61e1c36b18f1dd615a149ebc29617c4.tar.gz
packages_apps_settings-4eb13d06b61e1c36b18f1dd615a149ebc29617c4.tar.bz2
Merge "Show "disconnected" progress bar on add network flow"
-rw-r--r--src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index ca7be1b..1c78cce 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -462,6 +462,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
showAddNetworkTitle();
mConnectButton.setVisibility(View.VISIBLE);
+ showDisconnectedProgressBar();
showEditingButtonState();
} else if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
mNetworkName = selectedAccessPoint.getTitle().toString();
@@ -471,6 +472,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
} else {
mNetworkName = selectedAccessPoint.getTitle().toString();
showEditingTitle();
+ showDisconnectedProgressBar();
showEditingButtonState();
if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
onEapNetworkSelected();