Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate

2014-09-24 02:01:53 +02:00
parent f7d49a48cb
commit b373c866e7
12 changed files with 952 additions and 10 deletions
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -619,6 +619,9 @@
        <activity
            android:name=".ui.PassphraseDialogActivity"
            android:theme="@android:style/Theme.NoDisplay" />
+        <activity
+            android:name="ui.NfcActivity"
+            android:launchMode="singleTop" />
        <activity
            android:name=".ui.HelpActivity"
            android:label="@string/title_help" />