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

am c190c4f5: Merge "Grey out wifi tethering in airplane mode" into froyo

Browse Source 
Merge commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48' into kraken

* commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48':
  Grey out wifi tethering in airplane mode
This commit is contained in:
Irfan Sheriff
2010-04-14 16:30:53 -07:00
committed by Android Git Automerger
parent 02b576205f c190c4f535
commit 39a7379ad0
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/wifi/WifiApEnabler.java
View File

@@ -88,6 +88,7 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
public void resume() { public void resume() {
mContext.registerReceiver(mReceiver, mIntentFilter); mContext.registerReceiver(mReceiver, mIntentFilter);
enableWifiCheckBox();
mCheckBox.setOnPreferenceChangeListener(this); mCheckBox.setOnPreferenceChangeListener(this);
} }
@@ -96,6 +97,16 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
mCheckBox.setOnPreferenceChangeListener(null); mCheckBox.setOnPreferenceChangeListener(null);
} }
private void enableWifiCheckBox() {
boolean isAirplaneMode = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.AIRPLANE_MODE_ON, 0) != 0;
if(!isAirplaneMode) {
mCheckBox.setEnabled(true);
} else {
mCheckBox.setEnabled(false);
}
}
public boolean onPreferenceChange(Preference preference, Object value) { public boolean onPreferenceChange(Preference preference, Object value) {
final ContentResolver cr = mContext.getContentResolver(); final ContentResolver cr = mContext.getContentResolver();
@@ -182,6 +193,7 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
* broadcast notice * broadcast notice
*/ */
mCheckBox.setChecked(true); mCheckBox.setChecked(true);
/* Doesnt need the airplane check */
mCheckBox.setEnabled(true); mCheckBox.setEnabled(true);
break; break;
case WifiManager.WIFI_AP_STATE_DISABLING: case WifiManager.WIFI_AP_STATE_DISABLING:
@@ -191,12 +203,12 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
case WifiManager.WIFI_AP_STATE_DISABLED: case WifiManager.WIFI_AP_STATE_DISABLED:
mCheckBox.setChecked(false); mCheckBox.setChecked(false);
mCheckBox.setSummary(mOriginalSummary); mCheckBox.setSummary(mOriginalSummary);
mCheckBox.setEnabled(true); enableWifiCheckBox();
break; break;
default: default:
mCheckBox.setChecked(false); mCheckBox.setChecked(false);
mCheckBox.setSummary(R.string.wifi_error); mCheckBox.setSummary(R.string.wifi_error);
mCheckBox.setEnabled(true); enableWifiCheckBox();
} }
} }
} }