aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-06 00:58:10 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-06 00:58:13 +0200
commit31cfbdc5d25f79ecda7c9c9290b8d80a4df5d89a (patch)
tree3ff712e0340b6e2bb5cc6b4628ad799dec5c9d7d /OpenKeychain/src/main/AndroidManifest.xml
parent60e9141b8612ee8d0344e3c66109dfb9877e108a (diff)
downloadopen-keychain-31cfbdc5d25f79ecda7c9c9290b8d80a4df5d89a.tar.gz
open-keychain-31cfbdc5d25f79ecda7c9c9290b8d80a4df5d89a.tar.bz2
open-keychain-31cfbdc5d25f79ecda7c9c9290b8d80a4df5d89a.zip
linked: fix "navigate up" in LinkedIdWizard (imperfect)
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index d2e953f8a..1cd51d3c6 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -113,7 +113,9 @@
<activity
android:name=".ui.linked.LinkedIdWizard"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
- android:label="@string/title_linked_create">
+ android:label="@string/title_linked_create"
+ android:parentActivityName=".ui.ViewKeyActivity"
+ >
</activity>
<activity
android:name=".ui.QrCodeViewActivity"