From 96bed5ef1a8184b0ce7347f23bceea54b0c15fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 26 Oct 2015 19:58:56 +0100
Subject: Update zxing-android-embedded with new custom activity

---
 .../src/main/res/layout/qr_code_capture_activity.xml        | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/qr_code_capture_activity.xml

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

diff --git a/OpenKeychain/src/main/res/layout/qr_code_capture_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_capture_activity.xml
new file mode 100644
index 000000000..094901740
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/qr_code_capture_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.journeyapps.barcodescanner.CompoundBarcodeView
+        android:id="@+id/zxing_barcode_scanner"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true" />
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3