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

Remove NSD checkbox

Browse Source 
Bug: 6449478
Change-Id: Ic4aa44cb08843819c3290b16d906c989ee306727
This commit is contained in:
Irfan Sheriff
2012-05-07 15:51:37 -07:00
parent 31a84c881c
commit 936e3faae1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/WirelessSettings.java
View File

@@ -103,7 +103,10 @@ public class WirelessSettings extends SettingsPreferenceFragment {
mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference); mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam); mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
mNsdEnabler = new NsdEnabler(activity, nsd);
// Remove NSD checkbox by default
getPreferenceScreen().removePreference(nsd);
//mNsdEnabler = new NsdEnabler(activity, nsd);
String toggleable = Settings.System.getString(activity.getContentResolver(), String toggleable = Settings.System.getString(activity.getContentResolver(),
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS); Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
@@ -178,7 +181,9 @@ public class WirelessSettings extends SettingsPreferenceFragment {
if (mNfcEnabler != null) { if (mNfcEnabler != null) {
mNfcEnabler.resume(); mNfcEnabler.resume();
} }
mNsdEnabler.resume(); if (mNsdEnabler != null) {
mNsdEnabler.resume();
}
} }
@Override @Override
@@ -189,7 +194,9 @@ public class WirelessSettings extends SettingsPreferenceFragment {
if (mNfcEnabler != null) { if (mNfcEnabler != null) {
mNfcEnabler.pause(); mNfcEnabler.pause();
} }
mNsdEnabler.pause(); if (mNsdEnabler != null) {
mNsdEnabler.pause();
}
} }
@Override @Override