Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e404288..e099bbb 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -783,7 +783,7 @@
<!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string>
<!-- Used in the 1st-level settings screen as the turn-on summary -->
- <string name="nfc_quick_toggle_summary">Use Near Field Communication to read Tags and exchange Tags</string>
+ <string name="nfc_quick_toggle_summary">Use Near Field Communication to read and exchange tags</string>
<!-- Wi-Fi Settings --> <skip />
<!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
@@ -1748,7 +1748,7 @@
<string name="filter_apps_running">Running</string>
<!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. [CHAR LIMIT=30] -->
- <string name="filter_apps_onsdcard" product="nosdcard">USB</string>
+ <string name="filter_apps_onsdcard" product="nosdcard">USB storage</string>
<!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. -->
<string name="filter_apps_onsdcard" product="default">On SD card</string>
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 4653c3a..1facab9 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -91,10 +91,5 @@
private void updateUi() {
mCheckbox.setChecked(mNfcState);
- if (mNfcState) {
- mCheckbox.setSummary(null);
- } else {
- mCheckbox.setSummary(R.string.nfc_quick_toggle_summary);
- }
}
-}
\ No newline at end of file
+}