aboutsummaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
commit38a9242955704232039272fd8b6011d47622495d (patch)
tree16665564834041b3c1218531d548449e64285f8d /AndroidManifest.xml
parent670dead69502884d178ab60ec10e8e0e7b7a7915 (diff)
brought muc invites back. + couple of bug fixes + refactoring
Diffstat (limited to '')
-rw-r--r--AndroidManifest.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a7bfbbe4..c04bb82b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,11 +49,11 @@
</intent-filter>
</activity>
<activity
- android:name="eu.siacs.conversations.ui.StartConversation"
+ android:name="eu.siacs.conversations.ui.StartConversationActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_start_conversation"
android:logo="@drawable/ic_activity"
- android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity">
+ android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
<intent-filter>
<action android:name="android.intent.action.SENDTO" />
@@ -68,6 +68,9 @@
android:label="@string/title_activity_settings"
android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
</activity>
+ <activity android:name="eu.siacs.conversations.ui.ChooseContactActivity"
+ android:label="@string/title_activity_choose_contact">
+ </activity>
<activity
android:name="eu.siacs.conversations.ui.ManageAccountActivity"
android:configChanges="orientation|screenSize"
@@ -75,7 +78,7 @@
android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
</activity>
<activity
- android:name="eu.siacs.conversations.ui.MucDetailsActivity"
+ android:name="eu.siacs.conversations.ui.ConferenceDetailsActivity"
android:label="@string/title_activity_conference_details"
android:windowSoftInputMode="stateHidden" >
</activity>