aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-02-26 02:06:57 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-02-26 02:06:57 +0100
commit72acaaa41f88c729b651575a2c014cff11ca0fe4 (patch)
tree96875707d11f4b9dceb0c9493f0daa1fb3fcb730 /OpenKeychain/src/main/AndroidManifest.xml
parenta38f84a40169a65bf0eac1e06165a844df9b642c (diff)
downloadopen-keychain-72acaaa41f88c729b651575a2c014cff11ca0fe4.tar.gz
open-keychain-72acaaa41f88c729b651575a2c014cff11ca0fe4.tar.bz2
open-keychain-72acaaa41f88c729b651575a2c014cff11ca0fe4.zip
Fingerprint verification, design fixes for qr code card
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 6426a229c..29b748410 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -443,6 +443,14 @@
android:value=".ui.MainActivity" />
</activity>
<activity
+ android:name=".ui.CertifyFingerprintActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+ android:label="@string/title_certify_key">
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value=".ui.MainActivity" />
+ </activity>
+ <activity
android:name=".ui.QrCodeScanActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/app_name"