diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-07 14:33:20 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-07 14:33:20 +0200 |
commit | e14ce09186cde662ec24312a1722692cac25d5c3 (patch) | |
tree | 5046ce1454375c5df34d9fb7091005d9a5a2a15f /OpenKeychain/src/main/AndroidManifest.xml | |
parent | f4cbd8cabbe9dcd01e430a4f9953f061092cdfe6 (diff) | |
download | open-keychain-e14ce09186cde662ec24312a1722692cac25d5c3.tar.gz open-keychain-e14ce09186cde662ec24312a1722692cac25d5c3.tar.bz2 open-keychain-e14ce09186cde662ec24312a1722692cac25d5c3.zip |
Better handling of actionbars back
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index caefafb54..c3ef16409 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -232,7 +232,12 @@ <activity android:name=".ui.UploadKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_send_key" /> + android:label="@string/title_send_key" + android:parentActivityName=".ui.ViewKeyActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.ViewKeyActivity" /> + </activity> <activity android:name=".ui.PreferencesActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" @@ -254,7 +259,12 @@ <activity android:name=".ui.CertifyKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_certify_key" /> + android:label="@string/title_certify_key" + android:parentActivityName=".ui.ViewKeyActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.ViewKeyActivity" /> + </activity> <activity android:name=".ui.ImportKeysActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" |