diff options
| author | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
| commit | ab37336d1edc446f17d7a7aaeb653efb170283d9 (patch) | |
| tree | 609ca7afbc7bd0c4af0344af310fa0bd352bd4ae /src/main/AndroidManifest.xml | |
| parent | fe60bd582aee184b49d1af14357cb88ad2637c3e (diff) | |
| parent | 936006173ce11111f10c0bddd66d28c439ca584e (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
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 bbec8f12d..57fdd4c69 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -92,6 +92,12 @@ android:screenOrientation="portrait" android:launchMode="singleTask"/> <activity + android:name=".ui.SetPresenceActivity" + android:label="@string/change_presence" + android:configChanges="orientation|screenSize" + android:windowSoftInputMode="stateHidden|adjustResize" + android:launchMode="singleTask"/> + <activity android:name=".ui.SettingsActivity" android:label="@string/title_activity_settings"/> <activity |