From b373c866e74adb2ee5c27479b6fac75d9e6f76fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 24 Sep 2014 02:01:53 +0200
Subject: Merge openpgp-card lib into OpenKeychain, it was already depending on
 OK, no need to separate

---
 OpenKeychain/src/main/res/drawable/yubikey_neo.png | Bin 0 -> 132128 bytes
 OpenKeychain/src/main/res/layout/nfc_activity.xml  |  30 +++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/drawable/yubikey_neo.png
 create mode 100644 OpenKeychain/src/main/res/layout/nfc_activity.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/drawable/yubikey_neo.png b/OpenKeychain/src/main/res/drawable/yubikey_neo.png
new file mode 100644
index 000000000..d4156eb5e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable/yubikey_neo.png differ
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
new file mode 100644
index 000000000..e78fa7c87
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -0,0 +1,30 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:background="#FFFFFFFF"
+    tools:context="org.sufficientlysecure.keychain.nfc.NfcActivityFull">
+
+    <TextView
+        android:text="Hold Yubikey against the back of your device!"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:id="@+id/textView"
+        android:gravity="center"
+        android:layout_gravity="center" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:src="@drawable/yubikey_neo"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@+id/textView" />
+
+</RelativeLayout>
-- 
cgit v1.2.3