diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-18 14:04:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 17:03:44 -0700 |
| commit | 17001cea9e198228c55111871518ebdf710f8544 (patch) | |
| tree | fecea66af6f9e3191b9d3ca56df12b4271aa8e1b /res | |
| parent | 98f3aff3c5cc46409ae06910dcec76bfd6faa1b4 (diff) | |
| download | packages_apps_settings-17001cea9e198228c55111871518ebdf710f8544.zip packages_apps_settings-17001cea9e198228c55111871518ebdf710f8544.tar.gz packages_apps_settings-17001cea9e198228c55111871518ebdf710f8544.tar.bz2 | |
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.
Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 3018f7c..2258426 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -786,6 +786,7 @@ <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 and exchange tags</string> + <string name="nfc_toggle_error" msgid="8998642457947607263">An error occurred.</string> <!-- Wi-Fi Settings --> <skip /> <!-- Used in the 1st-level settings screen to turn on Wi-Fi --> |