diff options
| author | Tim Bray <timbray@gmail.com> | 2014-09-12 08:34:51 -0700 |
|---|---|---|
| committer | Tim Bray <timbray@gmail.com> | 2014-09-13 21:41:03 -0700 |
| commit | 1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3 (patch) | |
| tree | 6571fc5b6aca0de6bd23e9acda38caf16d81cc30 /OpenKeychain/src/main/res/xml | |
| parent | 36ef8a9a62f32f0843c9e317d493a7f136624dce (diff) | |
| download | open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.tar.gz open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.tar.bz2 open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.zip | |
Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
4 files changed, 28 insertions, 24 deletions
diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index 3180f21aa..64023b4b5 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -1,6 +1,12 @@ <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" /> + <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference android:key="defaultEncryptionAlgorithm" android:persistent="false" android:title="@string/label_encryption_algorithm" /> @@ -28,11 +34,4 @@ android:title="@string/label_write_version_header" android:summary="@string/label_write_version_header_summary" /> </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" /> - </PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml new file mode 100644 index 000000000..c87c4df7b --- /dev/null +++ b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:title="Search Keyserver" + android:defaultValue="true" + android:summary="Search HKP keyserver" + android:key="search_keyserver_pref" /> + + <CheckBoxPreference + android:title="Search Keybase.io" + android:defaultValue="true" + android:summary="Search Keybase.io index" + android:key="search_keybase_pref" /> + + <PreferenceScreen + android:key="keyServers" + android:persistent="false" + android:title="@string/label_keyservers" /> +</PreferenceScreen>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml deleted file mode 100644 index fd3c6c31a..000000000 --- a/OpenKeychain/src/main/res/xml/gen_preferences.xml +++ /dev/null @@ -1,15 +0,0 @@ -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory android:title="@string/section_general"> - <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" /> - - <PreferenceScreen - android:key="keyServers" - android:persistent="false" - android:title="@string/label_keyservers" /> - </PreferenceCategory> -</PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index e6b68507a..dd7f1c3e6 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -1,7 +1,7 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> <header - android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$GeneralPrefsFragment" - android:title="@string/section_general" /> + android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$CloudSearchPrefsFragment" + android:title="@string/section_cloud_search" /> <header android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$AdvancedPrefsFragment" android:title="@string/section_advanced" /> |