diff options
Diffstat (limited to 'OpenPGP-Keychain/AndroidManifest.xml')
| -rw-r--r-- | OpenPGP-Keychain/AndroidManifest.xml | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml index c01f85088..8a340708d 100644 --- a/OpenPGP-Keychain/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -276,8 +276,17 @@ <activity android:name=".ui.ImportKeysActivity" android:label="@string/title_import_keys" + android:launchMode="singleTop" android:windowSoftInputMode="stateHidden" > + <!-- Handle NFC tags detected from outside our application --> + <intent-filter> + <action android:name="android.nfc.action.NDEF_DISCOVERED" /> + + <category android:name="android.intent.category.DEFAULT" /> + <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> + <data android:mimeType="application/pgp-keys" /> + </intent-filter> <!-- Keychain's own Actions --> <intent-filter android:label="@string/intent_import_key" > <action android:name="org.sufficientlysecure.keychain.action.IMPORT_KEY" /> @@ -337,21 +346,6 @@ </intent-filter> </activity> <activity - android:name=".ui.ShareNfcBeamActivity" - android:label="@string/title_share_by_nfc" - android:launchMode="singleTop" - android:uiOptions="splitActionBarWhenNarrow" > - - <!-- Handle NFC tags detected from outside our application --> - <intent-filter> - <action android:name="android.nfc.action.NDEF_DISCOVERED" /> - - <category android:name="android.intent.category.DEFAULT" /> - <!-- mime type as defined in http://tools.ietf.org/html/rfc3156, section 7 --> - <data android:mimeType="application/pgp-keys" /> - </intent-filter> - </activity> - <activity android:name=".ui.HelpActivity" android:label="@string/title_help" /> |