aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-18 18:25:44 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-18 18:25:44 +0100
commitaca54e31eae450e7deec54cca6654ee202c7a90f (patch)
tree19832f3076bc13b65eca38b2a4862e0bf39c4776 /OpenKeychain/src/main/AndroidManifest.xml
parent4499caef1e64d2e1afec37d360958f516da4dd40 (diff)
downloadopen-keychain-aca54e31eae450e7deec54cca6654ee202c7a90f.tar.gz
open-keychain-aca54e31eae450e7deec54cca6654ee202c7a90f.tar.bz2
open-keychain-aca54e31eae450e7deec54cca6654ee202c7a90f.zip
generalize nfc crypto input structure
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 91c84fb18..c5317ae24 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -680,6 +680,12 @@
android:taskAffinity=":Nfc"
android:allowTaskReparenting="true" />
+ <activity
+ android:name=".ui.NfcOperationActivity"
+ android:launchMode="singleTop"
+ android:taskAffinity=":Nfc"
+ android:allowTaskReparenting="true" />
+
<!--<activity-->
<!--android:name=".ui.NfcIntentActivity"-->
<!--android:launchMode="singleTop">-->