diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-22 21:39:20 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-22 21:39:20 +0100 |
| commit | 21e7102e3ab73ab045a93025e976fc55da69428b (patch) | |
| tree | 9cbd236b10c94d7dea403a9874b05292a38fc148 /OpenKeychain | |
| parent | 0cdd68e763fc5a345e10d0cdbce65f4348fd2057 (diff) | |
| download | open-keychain-21e7102e3ab73ab045a93025e976fc55da69428b.tar.gz open-keychain-21e7102e3ab73ab045a93025e976fc55da69428b.tar.bz2 open-keychain-21e7102e3ab73ab045a93025e976fc55da69428b.zip | |
Fix back button in encrypt activities
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index d47729127..c8f190151 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -145,7 +145,11 @@ android:name=".ui.EncryptFilesActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_encrypt_files" - android:windowSoftInputMode="stateHidden"> + android:windowSoftInputMode="stateHidden" + android:parentActivityName=".ui.MainActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.MainActivity" /> <!-- Keychain's own Actions --> <!-- ENCRYPT with data Uri --> @@ -174,7 +178,11 @@ android:name=".ui.EncryptTextActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_encrypt_text" - android:windowSoftInputMode="stateHidden"> + android:windowSoftInputMode="stateHidden" + android:parentActivityName=".ui.MainActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.MainActivity" /> <!-- Keychain's own Actions --> <!-- ENCRYPT with text as extra --> @@ -405,8 +413,7 @@ <activity android:name=".ui.ViewKeyAdvancedActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_advanced_key_info"> - </activity> + android:label="@string/title_advanced_key_info"></activity> <activity android:name=".ui.SettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" @@ -652,8 +659,7 @@ android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:screenOrientation="user" android:theme="@style/Alp.42447968.Theme.Dialog.Light" /> - <activity - android:name=".ui.PassphraseWizardActivity" /> + <activity android:name=".ui.PassphraseWizardActivity" /> <!-- NOTE: singleTop is set to get NFC foreground dispatch to work. Then, all NFC intents will be broadcasted to onNewIntent() of this activity! |