From 8fd688ca96005152be754eeba1be72c7c0aab9ad Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 11 Aug 2015 17:35:53 +0200
Subject: Merge tag '1.5.2' into trz/rebase

---
 src/main/res/xml/preferences.xml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'src/main/res/xml/preferences.xml')

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 9cf2ed93..9def87c4 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -139,16 +139,27 @@
             android:key="send_button_status"
             android:summary="@string/pref_use_send_button_to_indicate_status_summary"
             android:title="@string/pref_use_send_button_to_indicate_status" />
+        <ListPreference
+            android:key="quick_action"
+            android:defaultValue="recent"
+            android:entries="@array/quick_actions"
+            android:entryValues="@array/quick_action_values"
+            android:summary="@string/pref_quick_action_summary"
+            android:title="@string/pref_quick_action"
+            android:dialogTitle="@string/choose_quick_action"/>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="show_dynamic_tags"
             android:summary="@string/pref_show_dynamic_tags_summary"
             android:title="@string/pref_show_dynamic_tags" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_advanced_options" >
+    <PreferenceCategory
+        android:title="@string/pref_advanced_options"
+        android:key="advanced">
         <PreferenceScreen
             android:summary="@string/pref_expert_options_summary"
-            android:title="@string/pref_expert_options" >
+            android:title="@string/pref_expert_options"
+            android:key="expert">
             <PreferenceCategory android:title="@string/pref_encryption_settings" >
                 <CheckBoxPreference
                     android:defaultValue="false"
@@ -173,6 +184,17 @@
 			        android:title="@string/pref_display_enter_key"
 			        android:summary="@string/pref_display_enter_key_summary" />
 	        </PreferenceCategory>
+			<PreferenceCategory android:title="@string/pref_certificate_options">
+				<CheckBoxPreference
+					android:defaultValue="false"
+					android:key="dont_trust_system_cas"
+					android:title="@string/pref_dont_trust_system_cas_title"
+					android:summary="@string/pref_dont_trust_system_cas_summary" />
+				<Preference
+					android:key="remove_trusted_certificates"
+					android:title="@string/pref_remove_trusted_certificates_title"
+					android:summary="@string/pref_remove_trusted_certificates_summary" />
+			</PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_expert_options_other" >
                 <CheckBoxPreference
                     android:defaultValue="false"
-- 
cgit v1.2.3