diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
| commit | b4aec3114d9911cf9aef0d14ee697e5131b2853f (patch) | |
| tree | 7237de5955ec34d8849737b2f9229bfbb37d0c45 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | c2163460971cc01e65d7dfd18eec491f01ebc744 (diff) | |
| parent | baac30508d24dcda6135bf8ae338c99d8c3b8ad8 (diff) | |
| download | open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.gz open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.bz2 open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.zip | |
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 876d34cf4..f72506144 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -90,6 +90,8 @@ android:name=".ui.CreateKeyActivity" android:windowSoftInputMode="adjustResize" android:label="@string/title_manage_my_keys" + android:launchMode="singleTop" + android:allowTaskReparenting="true" android:parentActivityName=".ui.MainActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" @@ -673,7 +675,7 @@ taskAffinity and allowTaskReparenting somehow prevents this from happening! --> <activity - android:name=".ui.NfcActivity" + android:name=".ui.NfcOperationActivity" android:launchMode="singleTop" android:taskAffinity=":Nfc" android:allowTaskReparenting="true" /> @@ -699,6 +701,10 @@ android:exported="false" android:process=":passphrase_cache" /> <service + android:name=".remote.CryptoInputParcelCacheService" + android:exported="false" + android:process=":remote_api" /> + <service android:name=".service.KeychainIntentService" android:exported="false" /> <service |