From 1bdb7874adf52b0fc2fe6ec40913a0562cf585ed Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 14 Oct 2010 17:20:59 -0700
Subject: [PATCH] Make summary appear for both checked and unchecked NFC
 checkbox in Settings.

And remove the extra "Tag" in the summary.

Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
---
 res/values/strings.xml                       | 2 +-
 src/com/android/settings/nfc/NfcEnabler.java | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fb762530ed8..e099bbbb2ad 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 4653c3ad4a9..1facab9fa1f 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
+}