From c292b8d9c3497b1482f3e4856033e10d06dd9388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 13:59:26 +0200
Subject: Experimental features settings reworked

---
 .../src/main/res/xml/experimental_preferences.xml    | 20 ++++++++++++++++++++
 OpenKeychain/src/main/res/xml/preference_headers.xml |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/xml/experimental_preferences.xml

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

diff --git a/OpenKeychain/src/main/res/xml/experimental_preferences.xml b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
new file mode 100644
index 000000000..dbf19bddb
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
@@ -0,0 +1,20 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:persistent="false"
+        android:selectable="false"
+        android:summary="@string/label_experimental_settings_desc_summary" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="experimentalEnableWordConfirm"
+        android:persistent="false"
+        android:summary="@string/label_experimental_settings_word_confirm_summary"
+        android:title="@string/label_experimental_settings_word_confirm_title" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="experimentalEnableLinkedIdentities"
+        android:persistent="false"
+        android:summary="@string/label_experimental_settings_linked_identities_summary"
+        android:title="@string/label_experimental_settings_linked_identities_title" />
+</PreferenceScreen>
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index 36fc9a7ae..4c40b9d1f 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -15,6 +15,6 @@
         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" />
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ExperimentalPrefsFragment"
+        android:title="@string/section_experimental_features" />
 </preference-headers>
-- 
cgit v1.2.3