From 703e0b34e7fb0720dfb601ed3faf5fc2918107db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 16 Oct 2015 13:11:28 +0200
Subject: Prevent nfc dialog from closing when touching outside of it, add
 cancel button

---
 OpenKeychain/src/main/res/layout/nfc_operation_activity.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout/nfc_operation_activity.xml')

diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
index 9a9738825..30d5013dc 100644
--- a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
@@ -14,7 +14,7 @@
         android:measureAllChildren="false"
         android:minHeight="?listPreferredItemHeightSmall"
         android:outAnimation="@anim/fade_out"
-        custom:initialView="3">
+        custom:initialView="0">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -41,6 +41,16 @@
                 android:adjustViewBounds="true"
                 android:background="@android:color/transparent"
                 android:src="@drawable/yubikey_phone" />
+
+            <Button
+                android:id="@+id/nfc_activity_0_cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="48dp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_below="@+id/nfc_activity_0_image"
+                android:layout_margin="8dp"
+                android:text="@string/progress_cancel" />
         </RelativeLayout>
 
         <RelativeLayout
-- 
cgit v1.2.3