Add NFC checkbox to Settings app.
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 78cf8cf..4e60dba 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.ServiceManager;
import android.os.SystemProperties;
@@ -29,28 +28,30 @@
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.provider.Settings;
-import android.util.Log;
-
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.wifi.WifiEnabler;
+import com.android.settings.nfc.NfcEnabler;
public class WirelessSettings extends PreferenceActivity {
private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
private static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";
private static final String KEY_TOGGLE_WIFI = "toggle_wifi";
+ private static final String KEY_TOGGLE_NFC = "toggle_nfc";
private static final String KEY_WIFI_SETTINGS = "wifi_settings";
private static final String KEY_BT_SETTINGS = "bt_settings";
private static final String KEY_VPN_SETTINGS = "vpn_settings";
private static final String KEY_TETHER_SETTINGS = "tether_settings";
+
public static final String EXIT_ECM_RESULT = "exit_ecm_result";
public static final int REQUEST_CODE_EXIT_ECM = 1;
private AirplaneModeEnabler mAirplaneModeEnabler;
private CheckBoxPreference mAirplaneModePreference;
private WifiEnabler mWifiEnabler;
+ private NfcEnabler mNfcEnabler;
private BluetoothEnabler mBtEnabler;
/**
@@ -91,11 +92,13 @@
CheckBoxPreference airplane = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
CheckBoxPreference wifi = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI);
CheckBoxPreference bt = (CheckBoxPreference) findPreference(KEY_TOGGLE_BLUETOOTH);
+ CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
mAirplaneModeEnabler = new AirplaneModeEnabler(this, airplane);
mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
mWifiEnabler = new WifiEnabler(this, wifi);
mBtEnabler = new BluetoothEnabler(this, bt);
+ mNfcEnabler = new NfcEnabler(this, nfc);
String toggleable = Settings.System.getString(getContentResolver(),
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
@@ -113,9 +116,14 @@
findPreference(KEY_BT_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
}
- // Disable Bluetooth Settings if Bluetooth service is not available.
+ // Remove Bluetooth Settings if Bluetooth service is not available.
if (ServiceManager.getService(BluetoothAdapter.BLUETOOTH_SERVICE) == null) {
- findPreference(KEY_BT_SETTINGS).setEnabled(false);
+ getPreferenceScreen().removePreference(bt);
+ }
+
+ // Remove NFC if its not available
+ if (ServiceManager.getService(Context.NFC_SERVICE) == null) {
+ getPreferenceScreen().removePreference(nfc);
}
// Disable Tethering if it's not allowed
@@ -145,21 +153,23 @@
@Override
protected void onResume() {
super.onResume();
-
+
mAirplaneModeEnabler.resume();
mWifiEnabler.resume();
mBtEnabler.resume();
+ mNfcEnabler.resume();
}
-
+
@Override
protected void onPause() {
super.onPause();
-
+
mAirplaneModeEnabler.pause();
mWifiEnabler.pause();
mBtEnabler.pause();
+ mNfcEnabler.pause();
}
-
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_EXIT_ECM) {