diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:17:11 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:17:11 +0200 |
| commit | 679ac2ea21709d3a4b0e80bdebe740beceac274d (patch) | |
| tree | 5988834eb4dd0ce1af72b61dd3d8e29b1d044b83 /src/main/AndroidManifest.xml | |
| parent | b6025f3506ee5adf5ccf42cefd9c3ff57d9ff1a1 (diff) | |
integrate image- and video player
Diffstat (limited to 'src/main/AndroidManifest.xml')
| -rw-r--r-- | src/main/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 1310816c4..a2acd1d38 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -29,6 +29,7 @@ android:label="@string/app_name" android:theme="@style/ConversationsTheme" android:name="android.support.multidex.MultiDexApplication" + android:largeHeap="true" tools:replace="android:label"> <service android:name=".services.XmppConnectionService"/> @@ -202,6 +203,11 @@ </intent-filter> </activity> <activity + android:name=".ui.ShowFullscreenMessageActivity" + android:configChanges="orientation|screenSize"> + + </activity> + <activity android:name=".ui.TrustKeysActivity" android:label="@string/trust_omemo_fingerprints" android:windowSoftInputMode="stateAlwaysHidden" /> |