diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-29 22:54:17 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-29 22:54:17 +0200 |
| commit | f275daf1fbb06951f5962f6478d3f8ff97fe6bb7 (patch) | |
| tree | 945696b200fb3e0c69ef5dbb7c9ecca877d85e9f /OpenKeychain/src/main | |
| parent | 43140c10b114c30e57531cf52fa1b3a47cc9a43a (diff) | |
| download | open-keychain-f275daf1fbb06951f5962f6478d3f8ff97fe6bb7.tar.gz open-keychain-f275daf1fbb06951f5962f6478d3f8ff97fe6bb7.tar.bz2 open-keychain-f275daf1fbb06951f5962f6478d3f8ff97fe6bb7.zip | |
Disable NfcIntentActivity until we implement it properly
Diffstat (limited to 'OpenKeychain/src/main')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index ddec381c8..209f560c6 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -633,16 +633,16 @@ android:taskAffinity=":Nfc" android:allowTaskReparenting="true" /> - <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.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" |