From d56c55c2edba1dfc9576f6c269302d665c823f7a Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Thu, 18 Aug 2011 22:57:50 +0200
Subject: [PATCH] ShareTap: add some more descriptive text.

Change-Id: I34c54c3f171ab02706ac3c4e3e15ea2629f91a7b
---
 res/layout/sharetap.xml | 7 -------
 res/values/strings.xml  | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/res/layout/sharetap.xml b/res/layout/sharetap.xml
index fb31d83d79..bd65df2a68 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 821ebd4465..e4f06d3d3c 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>
-- 
2.11.0