diff options
| author | Christian S <christian@pix-art.de> | 2016-05-06 10:23:20 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-06 10:23:20 +0200 |
| commit | f6250cacbbe0d70aed7ff75b4e4353cc0b8bae9b (patch) | |
| tree | fffd10ccd63408f2b0b7a868e9c062a5e77ac2ea /src/main | |
| parent | dc0036d9264bf1d71faa10ae8112066c8d389dc7 (diff) | |
bug fix in manifest
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/AndroidManifest.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 38789976c..1310816c4 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -28,8 +28,9 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/ConversationsTheme" - android:name="android.support.multidex.MultiDexApplication"> + android:name="android.support.multidex.MultiDexApplication" tools:replace="android:label"> + <service android:name=".services.XmppConnectionService"/> <receiver android:name=".services.EventReceiver"> @@ -184,7 +185,7 @@ android:value="@string/google_maps_api_key" /> <activity - android:name=".ShareLocationActivity" + android:name=".ui.ShareLocationActivity" android:label="@string/share_location" > <intent-filter> <action android:name="eu.siacs.conversations.location.request" /> @@ -193,7 +194,7 @@ </activity> <activity - android:name=".ShowLocationActivity" + android:name=".ui.ShowLocationActivity" android:label="@string/show_location" > <intent-filter> <action android:name="eu.siacs.conversations.location.show" /> |