diff options
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 44bfd18d..a10a9cc5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.siacs.conversations" - android:versionCode="20" - android:versionName="0.5-beta" > + android:versionCode="24" + android:versionName="0.6-alpha" > <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_PROFILE" /> <uses-permission android:name="android.permission.INTERNET" /> @@ -52,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" /> @@ -65,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" @@ -88,6 +92,11 @@ android:windowSoftInputMode="stateHidden" > </activity> <activity + android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity" + android:label="@string/publish_avatar" + android:windowSoftInputMode="stateHidden" > + </activity> + <activity android:name="eu.siacs.conversations.ui.ShareWithActivity" android:label="@string/title_activity_conversations" > <intent-filter> @@ -108,4 +117,4 @@ <activity android:name="de.duenndns.ssl.MemorizingActivity" /> </application> -</manifest> +</manifest>
\ No newline at end of file |