aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-04 22:56:33 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-04 22:56:33 +0100
commit39183418ab133f14bddc389dea8419980538f629 (patch)
treeaf4e2af1606c1d87c97382f0281ca7c3777e62e0 /src/main/AndroidManifest.xml
parentff10b094a0a210bb1c7745bd0e0f92e9a7e3ec2d (diff)
parentdf786cbf0114d49974f46433740e5ac89a00d63a (diff)
Merge pull request #616 from SamWhited/license-compliance
License compliance via an "about" menu item
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r--src/main/AndroidManifest.xml56
1 files changed, 33 insertions, 23 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 95663a87..225091f9 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -19,10 +19,10 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/ConversationsTheme"
- tools:replace="android:label">
- <service android:name="eu.siacs.conversations.services.XmppConnectionService" />
+ tools:replace="android:label" >
+ <service android:name=".services.XmppConnectionService" />
- <receiver android:name="eu.siacs.conversations.services.EventReceiver">
+ <receiver android:name=".services.EventReceiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -31,10 +31,10 @@
</receiver>
<activity
- android:name="eu.siacs.conversations.ui.ConversationActivity"
+ android:name=".ui.ConversationActivity"
android:label="@string/title_activity_conversations"
android:launchMode="singleTask"
- android:windowSoftInputMode="stateHidden">
+ android:windowSoftInputMode="stateHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -42,9 +42,9 @@
</intent-filter>
</activity>
<activity
- android:name="eu.siacs.conversations.ui.StartConversationActivity"
+ android:name=".ui.StartConversationActivity"
android:configChanges="orientation|screenSize"
- android:label="@string/title_activity_start_conversation">
+ android:label="@string/title_activity_start_conversation" >
<intent-filter>
<action android:name="android.intent.action.SENDTO" />
@@ -63,38 +63,40 @@
</intent-filter>
<intent-filter>
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
<category android:name="android.intent.category.DEFAULT" />
+
<data android:scheme="xmpp" />
</intent-filter>
</activity>
<activity
- android:name="eu.siacs.conversations.ui.SettingsActivity"
- android:label="@string/title_activity_settings"></activity>
+ android:name=".ui.SettingsActivity"
+ android:label="@string/title_activity_settings" />
<activity
- android:name="eu.siacs.conversations.ui.ChooseContactActivity"
- android:label="@string/title_activity_choose_contact"></activity>
+ android:name=".ui.ChooseContactActivity"
+ android:label="@string/title_activity_choose_contact" />
<activity
- android:name="eu.siacs.conversations.ui.ManageAccountActivity"
+ android:name=".ui.ManageAccountActivity"
android:configChanges="orientation|screenSize"
- android:label="@string/title_activity_manage_accounts"></activity>
+ android:label="@string/title_activity_manage_accounts" />
<activity
- android:name="eu.siacs.conversations.ui.EditAccountActivity"
- android:windowSoftInputMode="stateHidden|adjustResize"></activity>
+ android:name=".ui.EditAccountActivity"
+ android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
- android:name="eu.siacs.conversations.ui.ConferenceDetailsActivity"
+ android:name=".ui.ConferenceDetailsActivity"
android:label="@string/title_activity_conference_details"
- android:windowSoftInputMode="stateHidden"></activity>
+ android:windowSoftInputMode="stateHidden" />
<activity
- android:name="eu.siacs.conversations.ui.ContactDetailsActivity"
+ android:name=".ui.ContactDetailsActivity"
android:label="@string/title_activity_contact_details"
- android:windowSoftInputMode="stateHidden"></activity>
+ android:windowSoftInputMode="stateHidden" />
<activity
- android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity"
+ android:name=".ui.PublishProfilePictureActivity"
android:label="@string/mgmt_account_publish_avatar"
- android:windowSoftInputMode="stateHidden"></activity>
+ android:windowSoftInputMode="stateHidden" />
<activity
- android:name="eu.siacs.conversations.ui.ShareWithActivity"
- android:label="@string/title_activity_conversations">
+ android:name=".ui.ShareWithActivity"
+ android:label="@string/title_activity_conversations" >
<intent-filter>
<action android:name="android.intent.action.SEND" />
@@ -111,6 +113,14 @@
</intent-filter>
</activity>
<activity android:name="de.duenndns.ssl.MemorizingActivity" />
+ <activity
+ android:name=".ui.AboutActivity"
+ android:label="@string/title_activity_about"
+ android:parentActivityName=".ui.SettingsActivity" >
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="eu.siacs.conversations.ui.SettingsActivity" />
+ </activity>
</application>
</manifest>