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

am 8de45a66: am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings.

Browse Source 
Merge commit '8de45a6686b298d09c5195e332f202223a555b91'

* commit '8de45a6686b298d09c5195e332f202223a555b91':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
This commit is contained in:
Amith Yamasani
2010-10-16 09:43:15 -07:00
committed by Android Git Automerger
parent 38f0481c21 8de45a6686
commit 346ca43eeb
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -868,7 +868,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 -->

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

@@ -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);
}
}
}
}