Update zxing-android-embedded with new custom activity

2015-10-26 19:58:56 +01:00
parent c04c698992
commit 96bed5ef1a
5 changed files with 108 additions and 26 deletions
--- 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"