diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-08-15 17:31:24 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-08-15 17:31:24 +0200 |
| commit | 32c3dd4f4ada85b48551bcf7e17eafb63857237f (patch) | |
| tree | 13fb13cfb9507ee72c9777da8c50ca480c459d09 /AndroidManifest.xml | |
| parent | f7c747ef4b496df77388872c750bf95100991c76 (diff) | |
moved add/edit account from dialog into seperate activity
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc4df40e6..a10a9cc5f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -54,8 +54,7 @@ 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:logo="@drawable/ic_activity" > <intent-filter> <action android:name="android.intent.action.SENDTO" /> @@ -67,17 +66,20 @@ </activity> <activity android:name="eu.siacs.conversations.ui.SettingsActivity" - android:label="@string/title_activity_settings" - android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > + android:label="@string/title_activity_settings" > </activity> - <activity android:name="eu.siacs.conversations.ui.ChooseContactActivity" - android:label="@string/title_activity_choose_contact"> + <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" - android:label="@string/title_activity_manage_accounts" - android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > + android:label="@string/title_activity_manage_accounts" > + </activity> + <activity + android:name="eu.siacs.conversations.ui.EditAccountActivity" + android:windowSoftInputMode="stateHidden|adjustResize" > </activity> <activity android:name="eu.siacs.conversations.ui.ConferenceDetailsActivity" @@ -89,7 +91,7 @@ android:label="@string/title_activity_contact_details" android:windowSoftInputMode="stateHidden" > </activity> - <activity + <activity android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity" android:label="@string/publish_avatar" android:windowSoftInputMode="stateHidden" > @@ -115,4 +117,4 @@ <activity android:name="de.duenndns.ssl.MemorizingActivity" /> </application> -</manifest> +</manifest>
\ No newline at end of file |