aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-10-26 19:58:56 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-10-26 19:58:56 +0100
commit96bed5ef1a8184b0ce7347f23bceea54b0c15fe5 (patch)
treea5845a8f0efbe6a8c31c432397c3f8ffb4fdcbc6 /OpenKeychain/src/main/AndroidManifest.xml
parentc04c698992c340410421519ca1a7b83bff1d9b7e (diff)
downloadopen-keychain-96bed5ef1a8184b0ce7347f23bceea54b0c15fe5.tar.gz
open-keychain-96bed5ef1a8184b0ce7347f23bceea54b0c15fe5.tar.bz2
open-keychain-96bed5ef1a8184b0ce7347f23bceea54b0c15fe5.zip
Update zxing-android-embedded with new custom activity
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 3cac4ed10..8730a456e 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -499,7 +499,8 @@
<data android:mimeType="application/pgp-keys" />
</intent-filter>
</activity>
-
+ <activity
+ android:name=".ui.QrCodeCaptureActivity"/>
<activity
android:name=".ui.ImportKeysActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"