From dc8755780575465bf9cf0d7bf32b7d9c25ab0b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 13 Oct 2014 19:34:41 +0200
Subject: Group passphrase cache settings

---
 OpenKeychain/src/main/res/xml/adv_preferences.xml | 46 +++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(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
index fcca59abe..02986bdad 100644
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
@@ -1,15 +1,10 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/section_defaults">
-        <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:key="writeVersionHeader"
             android:persistent="false"
-            android:title="@string/label_passphrase_cache_subs" />
+            android:title="@string/label_write_version_header"
+            android:summary="@string/label_write_version_header_summary" />
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultEncryptionAlgorithm"
             android:persistent="false"
@@ -31,22 +26,27 @@
             android:persistent="false"
             android:title="@string/label_ascii_armor" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/section_advanced">
+    <PreferenceCategory android:title="@string/section_passphrase_cache">
+        <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="writeVersionHeader"
+            android:key="passphraseCacheSubs"
             android:persistent="false"
-            android:title="@string/label_write_version_header"
-            android:summary="@string/label_write_version_header_summary" />
+            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" />
     </PreferenceCategory>
-    <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>
-- 
cgit v1.2.3