diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 19:52:10 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 19:52:10 +0100 |
| commit | 1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75 (patch) | |
| tree | c19b5db3ecfaa2b2bf933d22d6fde80b406a6953 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 147003123fffc84b1d658f78d0a888479ce4ff35 (diff) | |
| download | open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.tar.gz open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.tar.bz2 open-keychain-1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75.zip | |
work on ad-hoc yubikey import support
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index d983498cc..fd999b0fb 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -90,6 +90,8 @@ android:name=".ui.CreateKeyActivity" android:windowSoftInputMode="adjustResize" android:label="@string/title_manage_my_keys" + android:launchMode="singleTop" + android:allowTaskReparenting="true" android:parentActivityName=".ui.MainActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" |