From 7ba0b93ceb2919aa549c14560ab434c39a364445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 24 Aug 2015 00:37:38 +0200
Subject: Move proxy pref values out of strings

---
 OpenKeychain/src/main/res/xml/proxy_prefs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
index 94e101cb6..d8e9d8b89 100644
--- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml
+++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
@@ -27,7 +27,7 @@
     <ListPreference
             android:entries="@array/pref_proxy_type_entries"
             android:entryValues="@array/pref_proxy_type_values"
-            android:defaultValue="@string/pref_proxy_type_value_http"
+            android:defaultValue="proxyHttp"
             android:key="proxyType"
             android:persistent="true"
             android:title="@string/pref_proxy_type_title" />
-- 
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/proxy_prefs.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
index d8e9d8b89..fbb83eb12 100644
--- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml
+++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference
+    <SwitchPreference
             android:key="useTorProxy"
             android:persistent="true"
             android:title="@string/pref_proxy_tor_title"
             android:summary="@string/pref_proxy_tor_summary" />
-    <CheckBoxPreference
+    <SwitchPreference
             android:key="useNormalProxy"
             android:persistent="true"
             android:title="@string/pref_proxy_normal_title" />
-- 
cgit v1.2.3