diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-06 18:20:53 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-06 18:20:53 +0100 |
commit | 9163b93a907a29dab04e1ca99b175b097d1e9d91 (patch) | |
tree | 0ccb243bff34ae5ac45047d742208b6ad7d558ad /OpenKeychain/src/main/AndroidManifest.xml | |
parent | e0f8d078629dcd04dced3a59bc45209b27a27b8b (diff) | |
parent | ae15b5dd0d7d57746c06a7a8c15e5d9dd14c858e (diff) | |
download | open-keychain-9163b93a907a29dab04e1ca99b175b097d1e9d91.tar.gz open-keychain-9163b93a907a29dab04e1ca99b175b097d1e9d91.tar.bz2 open-keychain-9163b93a907a29dab04e1ca99b175b097d1e9d91.zip |
Merge pull request #1597 from open-keychain/inline-ttl
Select time to remember password in dialog
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 b9c8f8a2b..945d7164c 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -467,6 +467,11 @@ android:label="@string/title_key_server_preference" android:windowSoftInputMode="stateHidden" /> <activity + android:name=".ui.SettingsCacheTTLActivity" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" + android:label="@string/title_cache_ttl_preference" + android:windowSoftInputMode="stateHidden" /> + <activity android:name=".ui.BackupActivity" android:configChanges="keyboardHidden|keyboard" android:label="@string/title_backup"> |