From 55de702961642521e247f155963644df81756215 Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Thu, 21 Oct 2010 19:40:16 -0700
Subject: [PATCH] Disable Wifi when a user press cancel in XL setup

Bug: 3122182
Change-Id: Id333b9ede9093fa7fb8aa256b720effa5abf290d
---
 src/com/android/settings/wifi/WifiSettings.java           | 4 ++++
 .../settings/wifi/WifiSettingsForSetupWizardXL.java       | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 85e399d2cb0..30c2a3d6431 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -732,4 +732,8 @@ public class WifiSettings extends SettingsPreferenceFragment
             return 0;
         }
     }
+
+    /* package */ void disableWifi() {
+        mWifiManager.setWifiEnabled(false);
+    }
 }
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 0ddd9da811a..ccdf9e97f34 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -19,11 +19,10 @@ package com.android.settings.wifi;
 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 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
             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;