diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 00:57:23 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-10 00:57:23 +0100 |
| commit | 4db86fdabe80cffba13b5e18e1576b5d8de39e8d (patch) | |
| tree | 80ca70fdd019824c65fc3b73740b1311cecc257e /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | f76f84dfb2e406dd613be04dabd9432ffd0f9c4b (diff) | |
| parent | e3547b497932a1c0219c11d586858754c82d19da (diff) | |
| download | open-keychain-4db86fdabe80cffba13b5e18e1576b5d8de39e8d.tar.gz open-keychain-4db86fdabe80cffba13b5e18e1576b5d8de39e8d.tar.bz2 open-keychain-4db86fdabe80cffba13b5e18e1576b5d8de39e8d.zip | |
Merge remote-tracking branch 'development' into linked-identities
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 886a8f7a5..3030cdbf2 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -93,7 +93,7 @@ <activity android:name=".ui.CreateKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" - android:windowSoftInputMode="stateHidden|adjustResize" + android:windowSoftInputMode="adjustResize" android:label="@string/title_create_key" android:parentActivityName=".ui.MainActivity"> <meta-data |