diff options
| author | Martijn Coenen <maco@google.com> | 2011-08-18 14:20:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-18 14:20:19 -0700 |
| commit | 2f61676f356f76487f86965546d4f000a11a502d (patch) | |
| tree | b31207f05e602b034a31ad37c1e6129d792188e9 /res | |
| parent | b28bb83f237a22b8902b1b453eef2f9f2f86fa23 (diff) | |
| parent | d56c55c2edba1dfc9576f6c269302d665c823f7a (diff) | |
| download | packages_apps_Settings-2f61676f356f76487f86965546d4f000a11a502d.tar.gz packages_apps_Settings-2f61676f356f76487f86965546d4f000a11a502d.tar.bz2 packages_apps_Settings-2f61676f356f76487f86965546d4f000a11a502d.zip | |
Merge "ShareTap: add some more descriptive text."
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/sharetap.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/res/layout/sharetap.xml b/res/layout/sharetap.xml index fb31d83d7..bd65df2a6 100644 --- a/res/layout/sharetap.xml +++ b/res/layout/sharetap.xml @@ -48,13 +48,6 @@ android:gravity="top" android:text="@string/zeroclick_top" /> - <TextView android:id="@+id/sharetap_safety" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="20dip" - android:gravity="top" - android:text="@string/zeroclick_safety" - /> </LinearLayout> </ScrollView> diff --git a/res/values/strings.xml b/res/values/strings.xml index 821ebd446..e4f06d3d3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1106,8 +1106,7 @@ <!-- Used in the zero-click sharing preferences screen --> <string name="zeroclick_label">ShareTap</string> <string name="zeroclick_explained">Share content by touching two NFC-enabled devices back to back.</string> - <string name="zeroclick_top">The app on the top device\'s screen sends content to the bottom device.</string> - <string name="zeroclick_safety">Your data is safe: nothing is shared unless both devices are on and unlocked.</string> + <string name="zeroclick_top">The app on the top device\'s screen sends content to the bottom device.\n\nYour data is safe: nothing is shared unless both devices are on and unlocked.\n\nYou can turn this feature off in Settings > More > ShareTap.</string> <!-- Wi-Fi Settings --> <skip /> <!-- Used in the 1st-level settings screen to turn on Wi-Fi --> <string name="wifi_quick_toggle_title">Wi-Fi</string> |