diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-23 23:04:18 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-23 23:04:18 +0200 |
| commit | 9f67b0fe54ed4045f8db2d377b90d15473a19912 (patch) | |
| tree | d97c8c36df221b9bb5fbf20a9de8a36ba779fe88 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 5e090e6fb613414206b62069d24310ecf86273ac (diff) | |
| download | open-keychain-9f67b0fe54ed4045f8db2d377b90d15473a19912.tar.gz open-keychain-9f67b0fe54ed4045f8db2d377b90d15473a19912.tar.bz2 open-keychain-9f67b0fe54ed4045f8db2d377b90d15473a19912.zip | |
DecryptTextActivity rework
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 9116a91b0..c78e80c19 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -96,7 +96,8 @@ <activity android:name=".ui.CreateKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_create_key"> + android:label="@string/title_create_key" + android:parentActivityName=".ui.KeyListActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.KeyListActivity" /> @@ -198,7 +199,11 @@ android:name=".ui.DecryptTextActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_decrypt" - android:windowSoftInputMode="stateHidden"> + android:windowSoftInputMode="stateHidden" + android:parentActivityName=".ui.DecryptActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.DecryptActivity" /> <!-- Keychain's own Actions --> <!-- DECRYPT with text as extra --> @@ -221,7 +226,11 @@ android:name=".ui.DecryptFilesActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_decrypt" - android:windowSoftInputMode="stateHidden"> + android:windowSoftInputMode="stateHidden" + android:parentActivityName=".ui.DecryptActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.DecryptActivity" /> <!-- VIEW with mimeType application/octet-stream, application/pgp and text/pgp --> <intent-filter android:label="@string/intent_send_decrypt"> |