From 350b724d098329186eb6f566029e0537ff24de9d Mon Sep 17 00:00:00 2001 From: Daisuke Miyakawa Date: Fri, 21 Jan 2011 14:29:50 -0800 Subject: [PATCH] Fix wifi flow - show progress bar correctly - stop inappropriately showing padding views - expand the screen when successful. Bug: 3378348 Bug: 3378341 Change-Id: I89ff31d24c050755c90fbf07cd4f56d8f0ddeac9 --- .../wifi/WifiSettingsForSetupWizardXL.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java index 476ba580a0e..9bc5211cdd6 100644 --- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java +++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java @@ -258,6 +258,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis } case CONNECTED: { hideSoftwareKeyboard(); + setPaddingVisibility(View.VISIBLE); // If the device is already connected to a wifi without users' "Connect" request, // this can be false here. We want to treat it as "after connect action". @@ -302,7 +303,12 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis showConnectingTitle(); mProgressBar.setIndeterminate(false); mProgressBar.setProgress(1); - setPaddingVisibility(View.VISIBLE); + + // We may enter "Connecting" status during editing password again (if the Wifi module + // tries to (re)connect a network.) + if (mAfterConnectAction) { + setPaddingVisibility(View.VISIBLE); + } } private void showDefaultTitle() { @@ -535,6 +541,14 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis */ /* package */ void onAccessPointsUpdated( PreferenceCategory holder, Collection accessPoints) { + // If we already show some of access points but the bar still shows "scanning" state, it + // should be stopped. + if (mProgressBar.isIndeterminate() && accessPoints.size() > 0) { + mProgressBar.setIndeterminate(false); + mAddNetworkButton.setEnabled(true); + mRefreshButton.setEnabled(true); + } + for (AccessPoint accessPoint : accessPoints) { accessPoint.setLayoutResource(R.layout.custom_preference); holder.addPreference(accessPoint);