diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-03-31 22:09:22 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-03-31 22:12:10 +0200 |
| commit | a7af64cbeb43214351bbf9557e7e78f2dd295f51 (patch) | |
| tree | 832f8e2212432934c68b094aea1673f5aa88b5f4 /src/main/res/layout | |
| parent | 6cfb99ae03a5ea8c992db099caa28ab79b0fbfce (diff) | |
integrate qr code scanner. temporarily break omemo activity scan
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/activity_scan.xml | 17 |
1 files changed, 17 insertions, 0 deletions
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 |