commit 1aac3240ef2a0080e1f4b422a919d2446b1fb154
author Daisuke Miyakawa <dmiyakawa@google.com> Sun Oct 24 13:43:52 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Oct 24 13:43:52 2010 -0700
tree 99317f4a352c304b5e94e5c18b18165eca823607
parent e94640aa9302fbab5bbc8643fdbad18a6473fd92
parent 55de702961642521e247f155963644df81756215

Merge "Disable Wifi when a user press cancel in XL setup"

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 85e399d..30c2a3d 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -732,4 +732,8 @@
             return 0;
         }
     }
+
+    /* package */ void disableWifi() {
+        mWifiManager.setWifiEnabled(false);
+    }
 }

src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java

diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 0ddd9da..ccdf9e9 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -19,11 +19,10 @@
 import com.android.settings.R;
 
 import android.app.Activity;
-import android.app.StatusBarManager;
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
 import android.os.Bundle;
-import android.util.Log;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.Window;
@@ -117,6 +116,11 @@
             mWifiSettings.onAddNetworkPressed();
             break;
         case R.id.wifi_setup_skip_or_next:
+            if (TextUtils.equals(getString(R.string.wifi_setup_skip), ((Button)view).getText())) {
+                // We don't want to let Wifi enabled when a user press skip without choosing
+                // any access point.
+                mWifiSettings.disableWifi();
+            }
             setResult(Activity.RESULT_OK);
             finish();
             break;