PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 083310d3: Update NFC settings description, and fix polarity.

Browse Source 
Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp

* commit '083310d316059c6592120c32e1c0b736e85b83c0':
  Update NFC settings description, and fix polarity.
This commit is contained in:
Nick Pelly
2010-10-12 21:27:48 -07:00
committed by Android Git Automerger
parent 0d5e320cdd 083310d316
commit f4e4319f41
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -785,7 +785,7 @@
<!-- Used in the 1st-level settings screen to turn on NFC --> <!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string> <string name="nfc_quick_toggle_title">NFC</string>
<!-- Used in the 1st-level settings screen as the turn-on summary --> <!-- Used in the 1st-level settings screen as the turn-on summary -->
<string name="nfc_quick_toggle_summary">Turn on NFC</string> <string name="nfc_quick_toggle_summary">Use Near Field Communication to read Tags and exchange Tags</string>
<!-- Wi-Fi Settings --> <skip /> <!-- Wi-Fi Settings --> <skip />
<!-- Used in the 1st-level settings screen to turn on Wi-Fi --> <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->

4
src/com/android/settings/nfc/NfcEnabler.java
View File

@@ -92,9 +92,9 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
private void updateUi() { private void updateUi() {
mCheckbox.setChecked(mNfcState); mCheckbox.setChecked(mNfcState);
if (mNfcState) { if (mNfcState) {
mCheckbox.setSummary(R.string.nfc_quick_toggle_summary); mCheckbox.setSummary(null);
} else { } else {
mCheckbox.setSummary(""); mCheckbox.setSummary(R.string.nfc_quick_toggle_summary);
} }
} }
} }