diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-29 20:48:11 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-29 20:48:11 +0200 |
| commit | a9c606d49bf7d4e7a30b7265cd1fb04ff1c3c01c (patch) | |
| tree | 9d3bf539e11bfd7f9d1d4d58fc046aa27e180897 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | cf59a8fc308a8988c949c1175c963977f84ee653 (diff) | |
| download | open-keychain-a9c606d49bf7d4e7a30b7265cd1fb04ff1c3c01c.tar.gz open-keychain-a9c606d49bf7d4e7a30b7265cd1fb04ff1c3c01c.tar.bz2 open-keychain-a9c606d49bf7d4e7a30b7265cd1fb04ff1c3c01c.zip | |
Create key wizard for blank YubiKey
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index c8073da00..a8c553add 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -95,6 +95,15 @@ <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> + <!-- Connect with YubiKeys. This Activity will automatically show/import/create key --> + <!--<intent-filter>--> + <!--<action android:name="android.nfc.action.NDEF_DISCOVERED"/>--> + <!--<category android:name="android.intent.category.DEFAULT"/>--> + <!--<data--> + <!--android:scheme="https"--> + <!--android:host="my.yubico.com"--> + <!--android:pathPrefix="/neo"/>--> + <!--</intent-filter>--> </activity> <activity android:name=".ui.EditKeyActivity" @@ -687,17 +696,6 @@ android:launchMode="singleTop" android:taskAffinity=":Nfc" /> - <!--<activity--> - <!--android:name=".ui.NfcIntentActivity"--> - <!--android:launchMode="singleTop">--> - <!--<intent-filter>--> - <!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />--> - - <!--<category android:name="android.intent.category.DEFAULT" />--> - <!--<data android:host="my.yubico.com" android:scheme="https"/>--> - <!--</intent-filter>--> - <!--</activity>--> - <activity android:name=".ui.HelpActivity" android:label="@string/title_help" /> |