From e3b1cf72093e80f7e1dd7d05cfc20a7376e98662 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 29 Aug 2017 20:34:39 +0200
Subject: [PATCH] slight changes to ui

---
 .../src/main/res/layout/transfer_fragment.xml     | 15 ++++++++++++++-
 OpenKeychain/src/main/res/values/strings.xml      |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/res/layout/transfer_fragment.xml b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
index 6700f1ade..fc47c9ffe 100644
--- a/OpenKeychain/src/main/res/layout/transfer_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
@@ -8,7 +8,7 @@
     android:id="@+id/transfer_animator"
     android:inAnimation="@anim/fade_in_delayed"
     android:outAnimation="@anim/fade_out"
-    custom:initialView="03">
+    custom:initialView="0">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -58,6 +58,17 @@
 
         </LinearLayout>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/transfer_scan_warning"
+            android:textColor="@color/android_red_dark"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -65,6 +76,7 @@
             android:gravity="center"
             tools:ignore="ButtonStyle" >
 
+            <!--
             <Button
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -74,6 +86,7 @@
                 android:drawableLeft="@drawable/ic_live_help_24dp"
                 android:drawableTint="@color/md_black_1000"
                 android:drawablePadding="8dp"/>
+            -->
 
             <Button
                 android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index a51dcdfdc..efa724e27 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1891,7 +1891,8 @@
 
     <string name="button_scan">"Scan"</string>
     <string name="button_more_info">"More Info"</string>
-    <string name="transfer_scan_explanation">"To transfer your keys, establish a secure connection by scanning with either device."</string>
+    <string name="transfer_scan_explanation">"To share or import your key setup, establish a secure connection by scanning with either device."</string>
+    <string name="transfer_scan_warning">Use with your own devices only!</string>
     <string name="connection_status">"Connection status:"</string>
     <string name="section_transfer_keys">"Available keys for transfer"</string>
     <string name="section_received_keys">"Received keys"</string>