diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
commit | 377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6 (patch) | |
tree | c90c5941126937485b31f617dd1c31acd23fabae /OpenKeychain/src/main/AndroidManifest.xml | |
parent | da131220aac727865b9e33e8d34743939e8acbf0 (diff) | |
parent | f4ee71e3ef0dcacf691def97a94880b277a99496 (diff) | |
download | open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.gz open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.bz2 open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.zip |
Merge branch 'ditch-appmsg'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 6236ed94f..8d3518a81 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -94,11 +94,6 @@ android:value=".ui.KeyListActivity" /> </activity> <activity - android:name=".ui.EditKeyActivityOld" - android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:label="@string/title_edit_key" - android:windowSoftInputMode="stateHidden" /> - <activity android:name=".ui.EditKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_edit_key" /> |