diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-14 16:35:56 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-14 16:35:56 +0200 |
commit | c7e2b8424e2c833015dd390ba6fd21f71957858b (patch) | |
tree | 17ec32642327a52fdd96a8430d4ab70e963ef345 /OpenKeychain/src/main/res/xml/adv_preferences.xml | |
parent | 7af02198573a820f308faf675bdf01b4792be015 (diff) | |
parent | dc8755780575465bf9cf0d7bf32b7d9c25ab0b54 (diff) | |
download | open-keychain-c7e2b8424e2c833015dd390ba6fd21f71957858b.tar.gz open-keychain-c7e2b8424e2c833015dd390ba6fd21f71957858b.tar.bz2 open-keychain-c7e2b8424e2c833015dd390ba6fd21f71957858b.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/xml/adv_preferences.xml')
-rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 46 |
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> |