diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-24 02:01:53 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-24 02:01:53 +0200 |
| commit | b373c866e74adb2ee5c27479b6fac75d9e6f76fc (patch) | |
| tree | fea6d6ce670a7c132310f72d354a3bbce7f2a129 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | f7d49a48cb0a8f26261ebb67c053f2d7f6e8d55d (diff) | |
| download | open-keychain-b373c866e74adb2ee5c27479b6fac75d9e6f76fc.tar.gz open-keychain-b373c866e74adb2ee5c27479b6fac75d9e6f76fc.tar.bz2 open-keychain-b373c866e74adb2ee5c27479b6fac75d9e6f76fc.zip | |
Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index c78e80c19..a3aa0d2a4 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -620,6 +620,9 @@ android:name=".ui.PassphraseDialogActivity" android:theme="@android:style/Theme.NoDisplay" /> <activity + android:name="ui.NfcActivity" + android:launchMode="singleTop" /> + <activity android:name=".ui.HelpActivity" android:label="@string/title_help" /> |