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/AndroidManifest.xml | |
| parent | 6cfb99ae03a5ea8c992db099caa28ab79b0fbfce (diff) | |
integrate qr code scanner. temporarily break omemo activity scan
Diffstat (limited to 'src/main/AndroidManifest.xml')
| -rw-r--r-- | src/main/AndroidManifest.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 961c4df2a..da6744a24 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="com.android.alarm.permission.SET_ALARM" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> + <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" /> @@ -82,11 +83,16 @@ android:launchMode="singleTask" android:minWidth="300dp" android:minHeight="300dp" - android:windowSoftInputMode="stateHidden"></activity> + android:windowSoftInputMode="stateHidden"> + </activity> + <activity + android:name=".ui.ScanActivity" + android:screenOrientation="portrait" + android:theme="@style/ConversationsTheme.FullScreen" + android:windowSoftInputMode="stateAlwaysHidden" /> <activity android:name=".ui.UriHandlerActivity" - android:label="@string/title_activity_start_conversation" - android:launchMode="singleTop"> + android:label="@string/title_activity_start_conversation"> <intent-filter> <action android:name="android.intent.action.VIEW" /> |