From ad50ba065d31f3d8ec53c512b6ba5cf94d15d1e3 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Wed, 22 Sep 2010 10:55:13 -0700 Subject: [PATCH] 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 --- AndroidManifest.xml | 1 + res/values/strings.xml | 6 + res/xml/wireless_settings.xml | 6 + .../android/settings/WirelessSettings.java | 28 +++-- src/com/android/settings/nfc/NfcEnabler.java | 106 ++++++++++++++++++ 5 files changed, 138 insertions(+), 9 deletions(-) create mode 100644 src/com/android/settings/nfc/NfcEnabler.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d9b39fe47b0..1094cf4b482 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -14,6 +14,7 @@ + diff --git a/res/values/strings.xml b/res/values/strings.xml index 208561ee2fa..2d402395e80 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -757,6 +757,12 @@ Remember settings + + + NFC + + Turn on NFC + Wi-Fi diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 7c91d509970..9116b7f0a00 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -40,6 +40,12 @@ android:targetClass="com.android.settings.wifi.WifiSettings" /> + +