aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-13 19:34:41 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-13 19:34:41 +0200
commitdc8755780575465bf9cf0d7bf32b7d9c25ab0b54 (patch)
tree37946d16457836d3d6b4d52c1ef39deaafadae77 /OpenKeychain/src/main/res/xml
parent85d4bcca5287364b295e1c49a06aee6e4f1c6122 (diff)
downloadopen-keychain-dc8755780575465bf9cf0d7bf32b7d9c25ab0b54.tar.gz
open-keychain-dc8755780575465bf9cf0d7bf32b7d9c25ab0b54.tar.bz2
open-keychain-dc8755780575465bf9cf0d7bf32b7d9c25ab0b54.zip
Group passphrase cache settings
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
-rw-r--r--OpenKeychain/src/main/res/xml/adv_preferences.xml46
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
index fcca59abe..02986bdad 100644
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
@@ -1,15 +1,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/section_defaults">
- <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
- android:entries="@array/passphrase_cache_ttl_entries"
- android:entryValues="@array/passphrase_cache_ttl_values"
- android:key="passphraseCacheTtl"
- android:persistent="false"
- android:title="@string/label_passphrase_cache_ttl" />
<CheckBoxPreference
- android:key="passphraseCacheSubs"
+ android:key="writeVersionHeader"
android:persistent="false"
- android:title="@string/label_passphrase_cache_subs" />
+ android:title="@string/label_write_version_header"
+ android:summary="@string/label_write_version_header_summary" />
<org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
android:key="defaultEncryptionAlgorithm"
android:persistent="false"
@@ -31,22 +26,27 @@
android:persistent="false"
android:title="@string/label_ascii_armor" />
</PreferenceCategory>
- <PreferenceCategory android:title="@string/section_advanced">
+ <PreferenceCategory android:title="@string/section_passphrase_cache">
+ <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
+ android:entries="@array/passphrase_cache_ttl_entries"
+ android:entryValues="@array/passphrase_cache_ttl_values"
+ android:key="passphraseCacheTtl"
+ android:persistent="false"
+ android:title="@string/label_passphrase_cache_ttl" />
<CheckBoxPreference
- android:key="writeVersionHeader"
+ android:key="passphraseCacheSubs"
android:persistent="false"
- android:title="@string/label_write_version_header"
- android:summary="@string/label_write_version_header_summary" />
+ android:title="@string/label_passphrase_cache_subs" />
+ <CheckBoxPreference
+ android:key="useDefaultYubikeyPin"
+ android:persistent="false"
+ android:defaultValue="true"
+ android:title="@string/label_use_default_yubikey_pin"
+ android:summary="@string/label_label_use_default_yubikey_pin_summary" />
+ <CheckBoxPreference
+ android:key="useNumKeypadForYubikeyPin"
+ android:persistent="false"
+ android:defaultValue="false"
+ android:title="@string/label_use_num_keypad_for_yubikey_pin" />
</PreferenceCategory>
- <CheckBoxPreference
- android:key="useDefaultYubikeyPin"
- android:persistent="false"
- android:defaultValue="true"
- android:title="@string/label_use_default_yubikey_pin"
- android:summary="@string/label_label_use_default_yubikey_pin_summary" />
- <CheckBoxPreference
- android:key="useNumKeypadForYubikeyPin"
- android:persistent="false"
- android:defaultValue="false"
- android:title="@string/label_use_num_keypad_for_yubikey_pin" />
</PreferenceScreen>