commit fc1b00cfe439b0c462b3acbba709c3cbc1132a1f
author Jason Monk <jmonk@google.com> Wed Jan 28 10:35:53 2015 -0500
committer Jason Monk <jmonk@google.com> Wed Feb 04 20:40:32 2015 +0000
tree e5ee7bbe9aeca8a4bea136736e16cfaa4ae2ba9f
parent 544714d0ea30ecc260778324e31b06d60f323ee2

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

src/com/android/settings/AirplaneModeEnabler.java

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 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 void resume() {
         
-        mSwitchPref.setChecked(isAirplaneModeOn(mContext));
+        mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
 
         mPhoneStateReceiver.registerIntent();
         mSwitchPref.setOnPreferenceChangeListener(this);
@@ -86,11 +87,6 @@
         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 @@
      * - mobile does not send failure notification, fail on timeout.
      */
     private void onAirplaneModeChanged() {
-        mSwitchPref.setChecked(isAirplaneModeOn(mContext));
+        mSwitchPref.setChecked(WirelessUtils.isAirplaneModeOn(mContext));
     }
     
     /**