work on ad-hoc yubikey import support

2015-03-21 19:52:10 +01:00
parent 147003123f
commit 1ad3635d13
7 changed files with 366 additions and 38 deletions
--- 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"