diff options
| author | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
| commit | c5dc1628a4068b8af3b2250080897e35937dc815 (patch) | |
| tree | 727ded0485a61fa64d613defb9b6917d9a6fa0ef /src/main/AndroidManifest.xml | |
| parent | 107acd1a5b03d25aa38d1ad73b957482ea781035 (diff) | |
| parent | b9de159e97090e132b74e934bc42fa6186105fd2 (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/AndroidManifest.xml')
| -rw-r--r-- | src/main/AndroidManifest.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 23273162e..f1f665d74 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -43,6 +43,7 @@ <activity android:name=".ui.ConversationActivity" android:label="@string/app_name" + android:configChanges="orientation|screenSize" android:launchMode="singleTask" android:windowSoftInputMode="stateHidden"> <intent-filter> @@ -99,14 +100,17 @@ android:launchMode="singleTask"/> <activity android:name=".ui.EditAccountActivity" + android:configChanges="orientation|screenSize" android:launchMode="singleTask" android:windowSoftInputMode="stateHidden|adjustResize"/> <activity android:name=".ui.ConferenceDetailsActivity" + android:configChanges="orientation|screenSize" android:label="@string/title_activity_conference_details" android:windowSoftInputMode="stateHidden"/> <activity android:name=".ui.ContactDetailsActivity" + android:configChanges="orientation|screenSize" android:label="@string/title_activity_contact_details" android:windowSoftInputMode="stateHidden"/> <activity |