diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-08 01:49:22 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-08 01:49:22 +0100 |
| commit | 2b5023a75d0c98738ed1aea2ea89de007cf2e3d7 (patch) | |
| tree | 8617aa8dcad7e32c9cb5b8483534d888aaf0c7d0 /OpenKeychain/src/main/res/xml/adv_preferences.xml | |
| parent | 581cad5b3f7b54fae652e2598b4e760eb19678d2 (diff) | |
| parent | 4f11fb5a2f08ecf5fb81c86d590d04387cd1cd9a (diff) | |
| download | open-keychain-2b5023a75d0c98738ed1aea2ea89de007cf2e3d7.tar.gz open-keychain-2b5023a75d0c98738ed1aea2ea89de007cf2e3d7.tar.bz2 open-keychain-2b5023a75d0c98738ed1aea2ea89de007cf2e3d7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/xml/adv_preferences.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 71 |
1 files changed, 21 insertions, 50 deletions
diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index 02986bdad..7dd649e5d 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -1,52 +1,23 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory android:title="@string/section_defaults"> - <CheckBoxPreference - android:key="writeVersionHeader" - android:persistent="false" - 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" - android:title="@string/label_encryption_algorithm" /> - <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference - android:key="defaultHashAlgorithm" - android:persistent="false" - android:title="@string/label_hash_algorithm" /> - <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference - android:key="defaultMessageCompression" - android:persistent="false" - android:title="@string/label_message_compression" /> - <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference - android:key="defaultFileCompression" - android:persistent="false" - android:title="@string/label_file_compression" /> - <CheckBoxPreference - android:key="defaultAsciiArmor" - android:persistent="false" - android:title="@string/label_ascii_armor" /> - </PreferenceCategory> - <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="passphraseCacheSubs" - android:persistent="false" - 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> + <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:persistent="false" + 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" /> </PreferenceScreen> |