From a7af64cbeb43214351bbf9557e7e78f2dd295f51 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 31 Mar 2018 22:09:22 +0200
Subject: integrate qr code scanner. temporarily break omemo activity scan

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

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

diff --git a/src/main/res/layout/activity_scan.xml b/src/main/res/layout/activity_scan.xml
new file mode 100644
index 000000000..0f3765b15
--- /dev/null
+++ b/src/main/res/layout/activity_scan.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextureView
+        android:id="@+id/scan_activity_preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:keepScreenOn="true" />
+
+    <eu.siacs.conversations.ui.widget.ScannerView
+        android:id="@+id/scan_activity_mask"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</merge>
\ No newline at end of file
-- 
cgit v1.2.3