Merge "Add on/off actionbar switch for NFC Tap To Share."

This commit is contained in:
Martijn Coenen
2011-07-28 06:48:55 -07:00
committed by Android (Google) Code Review
4 changed files with 59 additions and 40 deletions

View File

@@ -1091,11 +1091,13 @@
<!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string>
<!-- Used to enter the Zero-click sharing preferences screen -->
<string name="zeroclick_settings_title">Zero-click sharing</string>
<string name="zeroclick_settings_title">Tap to share</string>
<string name="zeroclick_settings_summary"></string>
<string name="zeroclick_on_summary">On</string>
<string name="zeroclick_off_summary">Off</string>
<!-- Used in the zero-click sharing preferences screen -->
<string name="zeroclick_label">Zero-click sharing</string>
<string name="zeroclick_explained">Zero-click sharing allows you to share content from applications, just by tapping your NFC-enabled device to another.</string>
<string name="zeroclick_explained">Tap to share allows you to share content from applications, just by tapping your NFC-enabled device to another.</string>
<!-- Wi-Fi Settings --> <skip />
<!-- Used in the 1st-level settings screen to turn on Wi-Fi -->