PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable Wifi when a user press cancel in XL setup

Browse Source 
Bug: 3122182
Change-Id: Id333b9ede9093fa7fb8aa256b720effa5abf290d
This commit is contained in:
Daisuke Miyakawa
2010-10-21 19:40:16 -07:00
parent 2ae29ff0ed
commit 55de702961
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -732,4 +732,8 @@ public class WifiSettings extends SettingsPreferenceFragment
return 0; return 0;
} }
} }
/* package */ void disableWifi() {
mWifiManager.setWifiEnabled(false);
}
} }

8
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -19,11 +19,10 @@ package com.android.settings.wifi;
import com.android.settings.R; import com.android.settings.R;
import android.app.Activity; import android.app.Activity;
import android.app.StatusBarManager;
import android.content.Context; import android.content.Context;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.Window; import android.view.Window;
@@ -117,6 +116,11 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mWifiSettings.onAddNetworkPressed(); mWifiSettings.onAddNetworkPressed();
break; break;
case R.id.wifi_setup_skip_or_next: 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); setResult(Activity.RESULT_OK);
finish(); finish();
break; break;