summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2010-11-11 09:20:26 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-11 09:20:26 -0800
commit23b0f055d361d6d727332b0ab8b976e911178f7e (patch)
treed364aa6b3409799e876ea1fdd4bb45a4cf06d1e3 /src
parent76629102b911a376eb49e7cffe2a4fb0e43aab55 (diff)
parentdd9fbb0b9e1b82025fc8699fe4ad4a9e2a918c4d (diff)
downloadpackages_apps_settings-23b0f055d361d6d727332b0ab8b976e911178f7e.zip
packages_apps_settings-23b0f055d361d6d727332b0ab8b976e911178f7e.tar.gz
packages_apps_settings-23b0f055d361d6d727332b0ab8b976e911178f7e.tar.bz2
Merge "Enable wifi on XL Wifi setup."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 17c0beb..635f301 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -113,6 +113,10 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
+ // There's no button here enabling wifi network, so we need to enable it without
+ // users' request.
+ mWifiManager.setWifiEnabled(true);
+
mWifiSettings =
(WifiSettings)getFragmentManager().findFragmentById(R.id.wifi_setup_fragment);
mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);