Merge "Not show connecting screen when editing a network"
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index f944b56..7feafe3 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -296,8 +296,7 @@
             break;
         }
         case CONNECTING: {
-            if (mScreenState != SCREEN_STATE_DISCONNECTED &&
-                    mScreenState != SCREEN_STATE_CONNECTED) {
+            if (mScreenState == SCREEN_STATE_CONNECTING) {
                 showConnectingState();
             }
             break;
@@ -760,6 +759,7 @@
     /** Note: doesn't affect bottom padding */
     // Used by WifiConfigUiForSetupWizardXL
     /* package */ void setPaddingVisibility(int visibility) {
+        Log.d("@@@", "setPaddingVisibilyty: " + visibility, new RuntimeException());
         setPaddingVisibility(visibility, visibility);
     }