diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 05:25:54 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 05:25:54 +0100 |
| commit | b8ed54bc699978355ffb5e9802902c6bc19a2e7a (patch) | |
| tree | 5a16699c8587f9eb98a6b113dda1fb933fe01360 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 84a57411a502795b3f58ac289fd735e99f6b86b9 (diff) | |
| parent | aaa475350348810ea4b6167b802cd8dba0783805 (diff) | |
| download | open-keychain-b8ed54bc699978355ffb5e9802902c6bc19a2e7a.tar.gz open-keychain-b8ed54bc699978355ffb5e9802902c6bc19a2e7a.tar.bz2 open-keychain-b8ed54bc699978355ffb5e9802902c6bc19a2e7a.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 6cfb07189..af5bd9e02 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -138,6 +138,7 @@ android:name=".ui.SafeSlingerActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_exchange_keys" + android:windowSoftInputMode="stateHidden" android:parentActivityName=".ui.KeyListActivity"> <meta-data android:name="android.support.PARENT_ACTIVITY" @@ -266,7 +267,7 @@ <!-- Keychain's own Actions --> <!-- DECRYPT with data Uri --> <intent-filter> - <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" /> + <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_DATA" /> <category android:name="android.intent.category.DEFAULT" /> |