Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs

This commit is contained in:
Tim Bray
2014-09-12 08:34:51 -07:00
parent 36ef8a9a62
commit 1c32d1df88
26 changed files with 500 additions and 526 deletions

View File

@@ -1,5 +1,11 @@
<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"
@@ -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>