diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-11 14:07:52 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-11 14:07:52 +0200 |
| commit | 0193e0291cff98843ce04aae3de05aa020e8d71d (patch) | |
| tree | f1aa5d49010abed3d9ee3e74c929509463a9664a /AndroidManifest.xml | |
| parent | f6649ef8382551c8b4010e194d6d77241bc86215 (diff) | |
cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e242c3e3..aef0cecf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -48,12 +48,22 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity + <activity android:name="eu.siacs.conversations.ui.StartConversation" + android:configChanges="orientation|screenSize" android:label="@string/title_activity_start_conversation" - android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" android:logo="@drawable/ic_activity" - ></activity> + android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" + android:windowSoftInputMode="stateHidden" > + <intent-filter> + <action android:name="android.intent.action.SENDTO" /> + + <category android:name="android.intent.category.DEFAULT" /> + + <data android:scheme="imto" /> + <data android:host="jabber" /> + </intent-filter> + </activity> <activity android:name="eu.siacs.conversations.ui.SettingsActivity" android:label="@string/title_activity_settings" @@ -76,24 +86,6 @@ android:windowSoftInputMode="stateHidden" > </activity> <activity - android:name="eu.siacs.conversations.ui.ContactsActivity" - android:label="@string/title_activity_contacts" - android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" - android:windowSoftInputMode="stateHidden" > - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value="de.gultsch.chat.ui.ConversationActivity" /> - - <intent-filter> - <action android:name="android.intent.action.SENDTO" /> - - <category android:name="android.intent.category.DEFAULT" /> - - <data android:scheme="imto" /> - <data android:host="jabber" /> - </intent-filter> - </activity> - <activity android:name="eu.siacs.conversations.ui.ShareWithActivity" android:label="@string/title_activity_conversations" > <intent-filter> |