diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-11 18:04:09 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-11 18:04:09 +0100 |
| commit | 5e3e6e2d62159eac6fb0e2c9d6f30afe941407d4 (patch) | |
| tree | c8a428a6d9020eb91548596a2a7ce7cc36b06604 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | c68b39211e3df7a73aa85fedc177cf7f7d087037 (diff) | |
| download | open-keychain-5e3e6e2d62159eac6fb0e2c9d6f30afe941407d4.tar.gz open-keychain-5e3e6e2d62159eac6fb0e2c9d6f30afe941407d4.tar.bz2 open-keychain-5e3e6e2d62159eac6fb0e2c9d6f30afe941407d4.zip | |
Fix singleTop definitions
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index c301973d2..86836741b 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -94,6 +94,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/Theme.Keychain.Light"> + <!-- singleTop for NFC dispatch, see SecurityTokenOperationActivity --> <activity android:name=".ui.MainActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" @@ -105,6 +106,7 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + <!-- singleTop for NFC dispatch, see SecurityTokenOperationActivity --> <activity android:name=".ui.CreateKeyActivity" android:allowTaskReparenting="true" @@ -137,7 +139,7 @@ android:name=".ui.linked.LinkedIdWizard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_linked_create" - android:parentActivityName=".ui.ViewKeyActivity"/> + android:parentActivityName=".ui.ViewKeyActivity" /> <!-- NOTE: Dont use configChanges for QR Code view! We use a different layout for landscape --> <activity android:name=".ui.QrCodeViewActivity" @@ -536,8 +538,7 @@ <activity android:name=".ui.ImportKeysActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_import_keys" - android:launchMode="singleTop"> + android:label="@string/title_import_keys"> <!-- VIEW with mimeType: Allows to import keys (attached to emails) from email apps --> <intent-filter android:label="@string/intent_import_key"> @@ -796,18 +797,15 @@ <activity android:name=".remote.ui.RemoteServiceActivity" android:exported="false" - android:label="@string/app_name" - android:launchMode="singleTop" /> + android:label="@string/app_name" /> <activity android:name=".remote.ui.SelectSignKeyIdActivity" android:exported="false" - android:label="@string/app_name" - android:launchMode="singleTop" /> + android:label="@string/app_name" /> <activity android:name=".remote.ui.SelectAllowedKeysActivity" android:exported="false" - android:label="@string/app_name" - android:launchMode="singleTop" /> + android:label="@string/app_name" /> <activity android:name=".remote.ui.AppSettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" |