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

Merge "Handle airplane mode change for hotspot settings"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-02-28 10:37:51 -08:00
committed by Android (Google) Code Review
parent 3cdf323c87 8e10affcde
commit 02ec121900
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,8 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
ArrayList<String> errored = intent.getStringArrayListExtra( ArrayList<String> errored = intent.getStringArrayListExtra(
ConnectivityManager.EXTRA_ERRORED_TETHER); ConnectivityManager.EXTRA_ERRORED_TETHER);
updateTetherState(available.toArray(), active.toArray(), errored.toArray()); updateTetherState(available.toArray(), active.toArray(), errored.toArray());
} else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {
enableWifiCheckBox();
} }
} }
@@ -84,6 +86,7 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
mIntentFilter = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION); mIntentFilter = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
mIntentFilter.addAction(ConnectivityManager.ACTION_TETHER_STATE_CHANGED); mIntentFilter.addAction(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
mIntentFilter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
} }
public void resume() { public void resume() {
@@ -103,6 +106,7 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
if(!isAirplaneMode) { if(!isAirplaneMode) {
mCheckBox.setEnabled(true); mCheckBox.setEnabled(true);
} else { } else {
mCheckBox.setSummary(mOriginalSummary);
mCheckBox.setEnabled(false); mCheckBox.setEnabled(false);
} }
} }