From a2d2da90984a6cc4191d55d349372f1ac5d6259a Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Tue, 17 May 2016 16:51:44 +0200
Subject: Settings: change CheckBoxPreference to SwitchPreference

---
 OpenKeychain/src/main/res/xml/passphrase_preferences.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
index 40500e53c..fa801ed8b 100644
--- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -1,15 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceScreen
         android:key="passphraseCacheTtls"
-        android:persistent="false"
         android:title="@string/label_passphrase_cache_ttl" />
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="passphraseCacheSubs"
-        android:persistent="true"
         android:title="@string/label_passphrase_cache_subs" />
-    <CheckBoxPreference
+    <SwitchPreference
         android:defaultValue="true"
         android:key="useNumKeypadForYubikeyPin"
-        android:persistent="true"
         android:title="@string/label_use_num_keypad_for_security_token_pin" />
 </PreferenceScreen>
-- 
cgit v1.2.3


From 2ab55b6767abd516ef86a6289d50ffe4bff2703a Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Tue, 17 May 2016 17:09:03 +0200
Subject: Settings: remove unuseful initialization

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

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

diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
index fa801ed8b..b9696492a 100644
--- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -4,6 +4,7 @@
         android:key="passphraseCacheTtls"
         android:title="@string/label_passphrase_cache_ttl" />
     <SwitchPreference
+        android:defaultValue="false"
         android:key="passphraseCacheSubs"
         android:title="@string/label_passphrase_cache_subs" />
     <SwitchPreference
-- 
cgit v1.2.3