From ec7a3a704701537eda24afe16081b18b34497928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 12:24:37 +0200
Subject: Experimental feature setting

---
 OpenKeychain/src/main/res/xml/adv_preferences.xml  | 23 ----------------------
 .../src/main/res/xml/passphrase_preferences.xml    | 23 ++++++++++++++++++++++
 .../src/main/res/xml/preference_headers.xml        |  7 +++++--
 3 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/xml/adv_preferences.xml
 create mode 100644 OpenKeychain/src/main/res/xml/passphrase_preferences.xml

(limited to 'OpenKeychain/src/main/res/xml')

diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
deleted file mode 100644
index 7dd649e5d..000000000
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <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>
diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
new file mode 100644
index 000000000..7dd649e5d
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -0,0 +1,23 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <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>
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index 606196c1e..36fc9a7ae 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -6,12 +6,15 @@
         android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment"
         android:title="@string/section_cloud_search" />
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$PassphrasePrefsFragment"
         android:title="@string/section_passphrase_cache" />
     <header
         android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment"
         android:title="@string/section_proxy_settings" />
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncSettingsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment"
         android:title="@string/section_sync_settings" />
+    <header
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$OtherPrefsFragment"
+        android:title="@string/section_other_settings" />
 </preference-headers>
-- 
cgit v1.2.3