am c190c4f5
: Merge "Grey out wifi tethering in airplane mode" into froyo
Merge commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48' into kraken * commit 'c190c4f5350eeac9faa78690f0a8a359ace55f48': Grey out wifi tethering in airplane mode
This commit is contained in:
@@ -88,6 +88,7 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
|
||||
|
||||
public void resume() {
|
||||
mContext.registerReceiver(mReceiver, mIntentFilter);
|
||||
enableWifiCheckBox();
|
||||
mCheckBox.setOnPreferenceChangeListener(this);
|
||||
}
|
||||
|
||||
@@ -96,6 +97,16 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
|
||||
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) {
|
||||
|
||||
final ContentResolver cr = mContext.getContentResolver();
|
||||
@@ -182,6 +193,7 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
|
||||
* broadcast notice
|
||||
*/
|
||||
mCheckBox.setChecked(true);
|
||||
/* Doesnt need the airplane check */
|
||||
mCheckBox.setEnabled(true);
|
||||
break;
|
||||
case WifiManager.WIFI_AP_STATE_DISABLING:
|
||||
@@ -191,12 +203,12 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
|
||||
case WifiManager.WIFI_AP_STATE_DISABLED:
|
||||
mCheckBox.setChecked(false);
|
||||
mCheckBox.setSummary(mOriginalSummary);
|
||||
mCheckBox.setEnabled(true);
|
||||
enableWifiCheckBox();
|
||||
break;
|
||||
default:
|
||||
mCheckBox.setChecked(false);
|
||||
mCheckBox.setSummary(R.string.wifi_error);
|
||||
mCheckBox.setEnabled(true);
|
||||
enableWifiCheckBox();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user