From 3f8f70b0a99554aae52fd80d31c29f32a34df5d2 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 17 Aug 2015 03:08:42 +0530
Subject: added sync preferences

---
 OpenKeychain/src/main/res/xml/sync_preferences.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/xml/sync_preferences.xml

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

diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml
new file mode 100644
index 000000000..d4ea81591
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml
@@ -0,0 +1,12 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+        android:key="syncKeyserver"
+        android:persistent="false"
+        android:title="@string/label_sync_settings_keyserver_title"
+        android:summary="@string/label_sync_settings_keyserver_summary" />
+    <CheckBoxPreference
+        android:key="syncContacts"
+        android:persistent="false"
+        android:title="@string/label_sync_settings_contacts_title"
+        android:summary="@string/label_sync_settings_contacts_summary" />
+</PreferenceScreen>
-- 
cgit v1.2.3


From f625a26bbd9e4e1049480028b7738ff4e37fd712 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 17 Aug 2015 03:39:24 +0530
Subject: added on/off summaries

---
 OpenKeychain/src/main/res/xml/sync_preferences.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml
index d4ea81591..e870be9ec 100644
--- a/OpenKeychain/src/main/res/xml/sync_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml
@@ -2,11 +2,9 @@
     <CheckBoxPreference
         android:key="syncKeyserver"
         android:persistent="false"
-        android:title="@string/label_sync_settings_keyserver_title"
-        android:summary="@string/label_sync_settings_keyserver_summary" />
+        android:title="@string/label_sync_settings_keyserver_title"/>
     <CheckBoxPreference
         android:key="syncContacts"
         android:persistent="false"
-        android:title="@string/label_sync_settings_contacts_title"
-        android:summary="@string/label_sync_settings_contacts_summary" />
+        android:title="@string/label_sync_settings_contacts_title" />
 </PreferenceScreen>
-- 
cgit v1.2.3


From 905e738621e43908e5dd19894544acf97f9076e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 14:05:58 +0200
Subject: Use SwitchPreference more often

---
 OpenKeychain/src/main/res/xml/sync_preferences.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml
index e870be9ec..de41ff030 100644
--- a/OpenKeychain/src/main/res/xml/sync_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml
@@ -1,9 +1,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="syncKeyserver"
         android:persistent="false"
         android:title="@string/label_sync_settings_keyserver_title"/>
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="syncContacts"
         android:persistent="false"
         android:title="@string/label_sync_settings_contacts_title" />
-- 
cgit v1.2.3