summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-03-02 18:25:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-02 18:25:53 -0800
commit027d610205cba25080da2a075157a7aa8cdf039a (patch)
tree1409da1dc4f7ff10ee6cb46c11486f5958a0df53
parente0d9ed4a31620d5e9cb944bc11a019984cc67eb7 (diff)
parent83183f469875e9835d32311c5c7f60c04eed8da4 (diff)
downloadpackages_apps_settings-027d610205cba25080da2a075157a7aa8cdf039a.zip
packages_apps_settings-027d610205cba25080da2a075157a7aa8cdf039a.tar.gz
packages_apps_settings-027d610205cba25080da2a075157a7aa8cdf039a.tar.bz2
Merge "Notify "skip to caller."
-rw-r--r--src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 794d430..b265362 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -243,8 +243,11 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
// We don't want to let Wifi enabled when a user press skip without choosing
// any access point.
mWifiManager.setWifiEnabled(false);
+ // Notify "skip"
+ setResult(RESULT_FIRST_USER);
+ } else {
+ setResult(RESULT_OK);
}
- setResult(RESULT_OK);
finish();
} else if (view == mConnectButton) {
if (DEBUG) Log.d(TAG, "Connect button pressed");