Merge "Not show connecting screen when editing a network"

This commit is contained in:
Daisuke Miyakawa
2011-03-02 12:25:51 -08:00
committed by Android (Google) Code Review

View File

@@ -296,8 +296,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
break; break;
} }
case CONNECTING: { case CONNECTING: {
if (mScreenState != SCREEN_STATE_DISCONNECTED && if (mScreenState == SCREEN_STATE_CONNECTING) {
mScreenState != SCREEN_STATE_CONNECTED) {
showConnectingState(); showConnectingState();
} }
break; break;
@@ -760,6 +759,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
/** Note: doesn't affect bottom padding */ /** Note: doesn't affect bottom padding */
// Used by WifiConfigUiForSetupWizardXL // Used by WifiConfigUiForSetupWizardXL
/* package */ void setPaddingVisibility(int visibility) { /* package */ void setPaddingVisibility(int visibility) {
Log.d("@@@", "setPaddingVisibilyty: " + visibility, new RuntimeException());
setPaddingVisibility(visibility, visibility); setPaddingVisibility(visibility, visibility);
} }