aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-06-10 22:58:20 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-10 22:58:20 +0200
commitaca07ad7418ed366acb144788844a63d9d154f41 (patch)
tree1ce55d49d8a3976f8fbf2f7e91cec7f70dcf3120 /src/main/AndroidManifest.xml
parent5f08b8f3b4abb131a4a196e54f648d97546af985 (diff)
check and request all needed permissions on startup
>= SDK 23 (Marshmallow)
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r--src/main/AndroidManifest.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 4e68a7760..7a95c8b91 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
</receiver>
<activity
- android:name=".ui.ConversationActivity"
+ android:name=".ui.startUI"
+ android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:label="@string/app_name"
android:launchMode="singleTask"
android:windowSoftInputMode="stateHidden">
@@ -60,6 +61,12 @@
</intent-filter>
</activity>
<activity
+ android:name=".ui.ConversationActivity"
+ android:label="@string/app_name"
+ android:launchMode="singleTask"
+ android:windowSoftInputMode="stateHidden">
+ </activity>
+ <activity
android:name=".ui.StartConversationActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_start_conversation"