aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-02-01 09:37:40 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-02-01 09:37:40 +0100
commitf5427837618b8fabd4e24c9ef19769bf6e60502b (patch)
tree746294afba297a272fa56b1a995d80f86d3d5ade /src/main/AndroidManifest.xml
parent3216813e4939941611e0226d2f56b9180fad173b (diff)
parente76a9c06c33e21138c32a34432c3c405f5c737a9 (diff)
Merge pull request #949 from kruks23/title_activity
Remove title_activity_conversations and use app_name instead
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r--src/main/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f3d58d57..e4e91d80 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
<activity
android:name=".ui.ConversationActivity"
- android:label="@string/title_activity_conversations"
+ android:label="@string/app_name"
android:launchMode="singleTask"
android:windowSoftInputMode="stateHidden" >
<intent-filter>
@@ -107,7 +107,7 @@
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".ui.ShareWithActivity"
- android:label="@string/title_activity_conversations" >
+ android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.SEND" />