aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-09-17 22:43:24 +0200
committerChristian Schneppe <christian@pix-art.de>2016-09-17 22:43:24 +0200
commit1c38d17fef7c1d5481a40162999e9f30349fa48f (patch)
tree3969c79c839aea464bde3b5423956a4cce79389c /src/main/AndroidManifest.xml
parentbaf43ba41ad2e8382cc294153ebce37b0f6a5f97 (diff)
some more changes to location activities
* show actionbar home as up * fix permission issue on devices < Android M * show buildings in map
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r--src/main/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 4298baf40..7e79e474a 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -204,6 +204,7 @@
<activity
android:name="de.pixart.messenger.ui.ShareLocationActivity"
android:label="@string/share_location"
+ android:parentActivityName="de.pixart.messenger.ui.ConversationActivity"
android:hardwareAccelerated="true">
<intent-filter>
<action android:name="de.pixart.messenger.location.request"/>