aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-11-30 22:57:29 +0100
committerChristian Schneppe <christian@pix-art.de>2017-12-01 21:45:25 +0100
commitffd61bf7d04ab2691ff55df26bd79d1b5c31b0b0 (patch)
tree319c4b91243f2813ad59754f6e00a1586d837a49
parentdbb240d043ac0affd09674c3cb053b4e7b0596b1 (diff)
use palceholder for package in manifest
-rw-r--r--src/main/AndroidManifest.xml74
-rw-r--r--src/main/res/layout/activity_about.xml2
-rw-r--r--src/main/res/layout/activity_updater.xml2
3 files changed, 39 insertions, 39 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 5705004af..e64e97f50 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -39,9 +39,9 @@
android:name="com.google.android.gms.car.application"
android:resource="@xml/automotive_app_desc" />
- <service android:name="de.pixart.messenger.services.XmppConnectionService" />
+ <service android:name=".services.XmppConnectionService" />
- <receiver android:name="de.pixart.messenger.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" />
@@ -52,20 +52,20 @@
<intent-filter>
<action android:name="android.intent.action.PACKAGE_REPLACED" />
<data
- android:path="de.pixart.messenger"
+ android:path="${applicationId}"
android:scheme="package" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.PACKAGE_RESTARTED" />
<data
- android:path="de.pixart.messenger"
+ android:path="${applicationId}"
android:scheme="package" />
</intent-filter>
</receiver>
- <receiver android:name="de.pixart.messenger.services.AlarmReceiver"></receiver>
+ <receiver android:name=".services.AlarmReceiver"></receiver>
<activity
- android:name="de.pixart.messenger.ui.StartUI"
+ android:name=".ui.StartUI"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask"
@@ -77,14 +77,14 @@
</intent-filter>
</activity>
<activity
- android:name="de.pixart.messenger.ui.ConversationActivity"
+ android:name=".ui.ConversationActivity"
android:label="@string/app_name"
android:launchMode="singleTask"
android:minWidth="300dp"
android:minHeight="300dp"
android:windowSoftInputMode="stateHidden"></activity>
<activity
- android:name="de.pixart.messenger.ui.StartConversationActivity"
+ android:name=".ui.StartConversationActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_start_conversation"
android:launchMode="singleTop">
@@ -121,57 +121,57 @@
</intent-filter>
</activity>
<activity
- android:name="de.pixart.messenger.ui.WelcomeActivity"
+ android:name=".ui.WelcomeActivity"
android:label="@string/app_name"
android:launchMode="singleTask" />
<activity
- android:name="de.pixart.messenger.ui.MagicCreateActivity"
+ android:name=".ui.MagicCreateActivity"
android:label="@string/create_account"
android:launchMode="singleTask" />
<activity
- android:name="de.pixart.messenger.ui.SetPresenceActivity"
+ android:name=".ui.SetPresenceActivity"
android:configChanges="orientation|screenSize"
android:label="@string/change_presence"
android:launchMode="singleTop"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
- android:name="de.pixart.messenger.ui.SettingsActivity"
+ android:name=".ui.SettingsActivity"
android:label="@string/title_activity_settings" />
<activity
- android:name="de.pixart.messenger.ui.ChooseContactActivity"
+ android:name=".ui.ChooseContactActivity"
android:label="@string/title_activity_choose_contact" />
<activity
- android:name="de.pixart.messenger.ui.BlocklistActivity"
+ android:name=".ui.BlocklistActivity"
android:label="@string/title_activity_block_list" />
<activity
- android:name="de.pixart.messenger.ui.ChangePasswordActivity"
+ android:name=".ui.ChangePasswordActivity"
android:label="@string/change_password_on_server" />
<activity
- android:name="de.pixart.messenger.ui.ManageAccountActivity"
+ android:name=".ui.ManageAccountActivity"
android:label="@string/title_activity_manage_accounts"
android:launchMode="singleTask" />
<activity
- android:name="de.pixart.messenger.ui.EditAccountActivity"
+ android:name=".ui.EditAccountActivity"
android:launchMode="singleTop"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
- android:name="de.pixart.messenger.ui.ConferenceDetailsActivity"
+ android:name=".ui.ConferenceDetailsActivity"
android:label="@string/title_activity_conference_details"
android:windowSoftInputMode="stateHidden" />
<activity
- android:name="de.pixart.messenger.ui.ContactDetailsActivity"
+ android:name=".ui.ContactDetailsActivity"
android:label="@string/title_activity_contact_details"
android:windowSoftInputMode="stateHidden" />
<activity
- android:name="de.pixart.messenger.ui.PublishProfilePictureActivity"
+ android:name=".ui.PublishProfilePictureActivity"
android:label="@string/mgmt_account_publish_avatar"
android:windowSoftInputMode="stateHidden" />
<activity
- android:name="de.pixart.messenger.ui.VerifyOTRActivity"
+ android:name=".ui.VerifyOTRActivity"
android:label="@string/verify_otr"
android:windowSoftInputMode="stateHidden" />
<activity
- android:name="de.pixart.messenger.ui.ShareWithActivity"
+ android:name=".ui.ShareWithActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<intent-filter>
@@ -195,7 +195,7 @@
android:value=".services.ContactChooserTargetService" />
</activity>
<activity
- android:name="de.pixart.messenger.ui.RecordingActivity"
+ android:name=".ui.RecordingActivity"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/ConversationsDialog">
@@ -213,30 +213,30 @@
android:value="@string/google_maps_api_key" />
<activity
- android:name="de.pixart.messenger.ui.ShareLocationActivity"
+ android:name=".ui.ShareLocationActivity"
android:label="@string/share_location"
- android:parentActivityName="de.pixart.messenger.ui.ConversationActivity"
+ android:parentActivityName=".ui.ConversationActivity"
>
<intent-filter>
- <action android:name="de.pixart.messenger.location.request" />
+ <action android:name=".location.request" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
- android:name="de.pixart.messenger.ui.ShowLocationActivity"
+ android:name=".ui.ShowLocationActivity"
android:label="@string/show_location">
<intent-filter>
- <action android:name="de.pixart.messenger.location.show" />
+ <action android:name=".location.show" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
- android:name="de.pixart.messenger.ui.ShowFullscreenMessageActivity"
+ android:name=".ui.ShowFullscreenMessageActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation|screenSize">
</activity>
<activity
- android:name="de.pixart.messenger.ui.TrustKeysActivity"
+ android:name=".ui.TrustKeysActivity"
android:label="@string/trust_omemo_fingerprints"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
@@ -244,15 +244,15 @@
android:theme="@style/ConversationsTheme"
tools:replace="android:theme" />
<activity
- android:name="de.pixart.messenger.ui.AboutActivity"
+ android:name=".ui.AboutActivity"
android:label="@string/title_activity_about"
- android:parentActivityName="de.pixart.messenger.ui.SettingsActivity">
+ android:parentActivityName=".ui.SettingsActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value="de.pixart.messenger.ui.SettingsActivity" />
+ android:value=".ui.SettingsActivity" />
</activity>
<activity
- android:name="de.pixart.messenger.ui.UpdaterActivity"
+ android:name=".ui.UpdaterActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_updater"
android:launchMode="singleTask"
@@ -262,10 +262,10 @@
android:name="com.soundcloud.android.crop.CropImageActivity">
</activity>
- <service android:name="de.pixart.messenger.services.UpdateService" />
- <service android:name="de.pixart.messenger.services.ExportLogsService" />
+ <service android:name=".services.UpdateService" />
+ <service android:name=".services.ExportLogsService" />
<service
- android:name="de.pixart.messenger.services.ContactChooserTargetService"
+ android:name=".services.ContactChooserTargetService"
android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
<intent-filter>
<action android:name="android.service.chooser.ChooserTargetService" />
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index ac5bafbdb..948e828fe 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,6 +1,6 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- tools:context="de.pixart.messenger.ui.AboutActivity"
+ tools:context="${applicationId}.ui.AboutActivity"
android:background="@color/grey50"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml
index 2d8538537..4aa9deb8f 100644
--- a/src/main/res/layout/activity_updater.xml
+++ b/src/main/res/layout/activity_updater.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context="de.pixart.messenger.ui.UpdaterActivity">
+ tools:context="${applicationId}.ui.UpdaterActivity">
<TextView
android:id="@+id/updater"