summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xres/values/strings.xml2
-rw-r--r--src/com/android/settings/nfc/NfcEnabler.java7
2 files changed, 2 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fb762530e..e099bbbb2 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 -->
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 4653c3ad4..1facab9fa 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -91,10 +91,5 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
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
+}