diff options
| author | Jason Monk <jmonk@google.com> | 2015-01-28 10:35:53 -0500 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-02-04 20:40:32 +0000 |
| commit | fc1b00cfe439b0c462b3acbba709c3cbc1132a1f (patch) | |
| tree | e5ee7bbe9aeca8a4bea136736e16cfaa4ae2ba9f /src/com/android/settings/AirplaneModeEnabler.java | |
| parent | 544714d0ea30ecc260778324e31b06d60f323ee2 (diff) | |
| download | packages_apps_Settings-fc1b00cfe439b0c462b3acbba709c3cbc1132a1f.zip packages_apps_Settings-fc1b00cfe439b0c462b3acbba709c3cbc1132a1f.tar.gz packages_apps_Settings-fc1b00cfe439b0c462b3acbba709c3cbc1132a1f.tar.bz2 | |
Move some wifi tracking code to SettingsLib
Move tracking of which networks are available/saved and their state
over to SettingsLib to share it with Quick Settings.
Bug: 19180466
Change-Id: Iaeef06b26da8cb38e1ba09a7d105d04d499dc181
Diffstat (limited to 'src/com/android/settings/AirplaneModeEnabler.java')
| -rw-r--r-- | src/com/android/settings/AirplaneModeEnabler.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 5b8ad0d..06648db 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -29,6 +29,7 @@ import android.provider.Settings; import com.android.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.TelephonyProperties; +import com.android.settingslib.WirelessUtils; public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListener { @@ -71,7 +72,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene public void resume() { - mSwitchPref.setChecked(isAirplaneModeOn(mContext)); + mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext)); mPhoneStateReceiver.registerIntent(); mSwitchPref.setOnPreferenceChangeListener(this); @@ -86,11 +87,6 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver); } - public static boolean isAirplaneModeOn(Context context) { - return Settings.Global.getInt(context.getContentResolver(), - Settings.Global.AIRPLANE_MODE_ON, 0) != 0; - } - private void setAirplaneModeOn(boolean enabling) { // Change the system setting Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, @@ -113,7 +109,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene * - mobile does not send failure notification, fail on timeout. */ private void onAirplaneModeChanged() { - mSwitchPref.setChecked(isAirplaneModeOn(mContext)); + mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext)); } /** |