diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-06-22 16:45:07 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-06-22 16:45:07 +0200 |
commit | 9e7e0be82cafc6dc98bbc31099ce0efc36a789a0 (patch) | |
tree | 1a3fa3971d953b1bd8a57479e216ad01e153868a /OpenKeychain/src/main/AndroidManifest.xml | |
parent | 79fb23b095fba273d77066204ee44d2b8d1edf8d (diff) | |
parent | 9f947aefe63055045b4dfa7087b858f8f3d2987e (diff) | |
download | open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.tar.gz open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.tar.bz2 open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.zip |
Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 48677431c..c6e528f4d 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -85,6 +85,11 @@ android:label="@string/title_edit_key" android:windowSoftInputMode="stateHidden" /> <activity + android:name=".ui.EditKeyActivityNew" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" + android:label="@string/title_edit_key" + android:windowSoftInputMode="stateHidden" /> + <activity android:name=".ui.ViewKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_key_details" |