diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-08-06 10:22:52 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-08-15 20:36:29 +0000 |
| commit | e3bced2cdaf70812f658c45c170e4943ed79dfaf (patch) | |
| tree | 35ba027f7e54bc9fa98fda8f090e46b4476086d1 /src/com/android/settings/WirelessSettings.java | |
| parent | cd93d141302ee374285d5a8dcd97bc7ab61298cc (diff) | |
| download | packages_apps_Settings-e3bced2cdaf70812f658c45c170e4943ed79dfaf.zip packages_apps_Settings-e3bced2cdaf70812f658c45c170e4943ed79dfaf.tar.gz packages_apps_Settings-e3bced2cdaf70812f658c45c170e4943ed79dfaf.tar.bz2 | |
Update Airplane mode to use a SwitchPreference
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 39d0f4c..b63a5a1 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -39,6 +39,7 @@ import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.telephony.TelephonyManager; @@ -79,7 +80,7 @@ public class WirelessSettings extends SettingsPreferenceFragment public static final int REQUEST_CODE_EXIT_ECM = 1; private AirplaneModeEnabler mAirplaneModeEnabler; - private CheckBoxPreference mAirplaneModePreference; + private SwitchPreference mAirplaneModePreference; private NfcEnabler mNfcEnabler; private NfcAdapter mNfcAdapter; private NsdEnabler mNsdEnabler; @@ -254,7 +255,7 @@ public class WirelessSettings extends SettingsPreferenceFragment final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER; final Activity activity = getActivity(); - mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE); + mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE); CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC); PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS); CheckBoxPreference nsd = (CheckBoxPreference) findPreference(KEY_TOGGLE_NSD); |