Commit c14ebe82 authored by Torsten Grote's avatar Torsten Grote

Merge branch '1365-keep-screen-on' into 'master'

Keep screen on while QR code viewfinder is open

See merge request !942
parents 00e9f894 499c586a
......@@ -3,7 +3,8 @@
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:layout_height="match_parent"
android:keepScreenOn="true">
<org.briarproject.briar.android.keyagreement.CameraView
android:id="@+id/camera_view"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment