diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-09-15 19:49:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-15 19:49:17 -0700 |
| commit | ae226fffadc5029e8de73248cb58ea8baf3a228e (patch) | |
| tree | 157963c26aef45df4e684ba02c997821c4e67f0b /src | |
| parent | f506cb958d924527607eb766979ab5af752b41ca (diff) | |
| parent | b1c0e0b1c93acbc71a2063411ae4ac86f9fc9fbf (diff) | |
| download | packages_apps_Settings-ae226fffadc5029e8de73248cb58ea8baf3a228e.zip packages_apps_Settings-ae226fffadc5029e8de73248cb58ea8baf3a228e.tar.gz packages_apps_Settings-ae226fffadc5029e8de73248cb58ea8baf3a228e.tar.bz2 | |
Merge "Fix settings handling of wifi events"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/wifi/WifiEnabler.java | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index 223022d..987294b 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -40,6 +40,7 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener { private AtomicBoolean mConnected = new AtomicBoolean(false); private final WifiManager mWifiManager; + private boolean mStateMachineEvent; private final IntentFilter mIntentFilter; private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override @@ -98,6 +99,10 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener { } public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + //Do nothing if called as a result of a state machine event + if (mStateMachineEvent) { + return; + } // Show toast message if Wi-Fi is not allowed in airplane mode if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_WIFI)) { Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show(); @@ -127,19 +132,28 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener { mSwitch.setEnabled(false); break; case WifiManager.WIFI_STATE_ENABLED: - mSwitch.setChecked(true); + setSwitchChecked(true); mSwitch.setEnabled(true); break; case WifiManager.WIFI_STATE_DISABLING: mSwitch.setEnabled(false); break; case WifiManager.WIFI_STATE_DISABLED: - mSwitch.setChecked(false); + setSwitchChecked(false); mSwitch.setEnabled(true); break; default: - mSwitch.setChecked(false); + setSwitchChecked(false); mSwitch.setEnabled(true); + break; + } + } + + private void setSwitchChecked(boolean checked) { + if (checked != mSwitch.isChecked()) { + mStateMachineEvent = true; + mSwitch.setChecked(checked); + mStateMachineEvent = false; } } |