From 6a7b3d99493e9ba1492e705dc748b85992c5ee14 Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Mon, 7 Mar 2011 16:28:09 -0800
Subject: [PATCH] Handle "scanning" status correctly

Bug: 4026282
Change-Id: I7dc113122a8611095642e1a70334d7cdc165173f
---
 .../wifi/WifiSettingsForSetupWizardXL.java       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

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