aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-06 19:42:55 +0100
committerlookshe <github@lookshe.org>2016-03-06 19:42:55 +0100
commit3c400703e082a1b180b35d891b8fb3460c7d5b87 (patch)
tree28738dd90fc41b4ab71897f38d324828778ad2e3 /src/main/res/xml
parent72114d732427266024cdd6e27cd8d1aa60afae2f (diff)
parentf28d77dc42f6bac5a026e0b1c78562dee8de45ac (diff)
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/res/xml')
-rw-r--r--src/main/res/xml/preferences.xml138
1 files changed, 83 insertions, 55 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 0232fe02..0d19ea5a 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -2,12 +2,12 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" >
- <PreferenceCategory android:title="@string/pref_general" >
+ <PreferenceCategory android:title="@string/pref_general">
<CheckBoxPreference
android:defaultValue="true"
android:key="grant_new_contacts"
android:summary="@string/pref_grant_presence_updates_summary"
- android:title="@string/pref_grant_presence_updates" />
+ android:title="@string/pref_grant_presence_updates"/>
<ListPreference
android:defaultValue="Mobile"
@@ -15,8 +15,7 @@
android:entryValues="@array/resources"
android:key="resource"
android:summary="@string/pref_xmpp_resource_summary"
- android:title="@string/pref_xmpp_resource" />
-
+ android:title="@string/pref_xmpp_resource"/>
<ListPreference
android:defaultValue="2"
android:entries="@array/confirm_strings"
@@ -29,7 +28,7 @@
android:defaultValue="false"
android:key="chat_states"
android:summary="@string/pref_chat_states_summary"
- android:title="@string/pref_chat_states" />
+ android:title="@string/pref_chat_states"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="parse_emoticons"
@@ -92,6 +91,7 @@
android:title="@string/pref_notifications" />
<PreferenceScreen
android:dependency="show_notification"
+ android:key="quiet_hours"
android:summary="@string/pref_quiet_hours_summary"
android:title="@string/title_pref_quiet_hours">
<CheckBoxPreference
@@ -142,92 +142,120 @@
android:title="@string/pref_conference_notifications" />
</PreferenceScreen>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_ui_options" >
+ <PreferenceCategory android:title="@string/pref_ui_options">
<CheckBoxPreference
android:defaultValue="true"
android:key="use_subject"
android:summary="@string/pref_conference_name_summary"
- android:title="@string/pref_conference_name" />
+ android:title="@string/pref_conference_name"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="use_larger_font"
android:summary="@string/pref_use_larger_font_summary"
- android:title="@string/pref_use_larger_font" />
+ android:title="@string/pref_use_larger_font"/>
<CheckBoxPreference
android:defaultValue="false"
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" />
+ android:title="@string/pref_use_send_button_to_indicate_status"/>
<ListPreference
- android:key="quick_action"
android:defaultValue="recent"
+ android:dialogTitle="@string/choose_quick_action"
android:entries="@array/quick_actions"
android:entryValues="@array/quick_action_values"
+ android:key="quick_action"
android:summary="@string/pref_quick_action_summary"
- android:title="@string/pref_quick_action"
- android:dialogTitle="@string/choose_quick_action"/>
+ android:title="@string/pref_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" />
+ android:title="@string/pref_show_dynamic_tags"/>
</PreferenceCategory>
<PreferenceCategory
- android:title="@string/pref_advanced_options"
- android:key="advanced">
+ android:key="advanced"
+ android:title="@string/pref_advanced_options">
<PreferenceScreen
+ android:key="expert"
android:summary="@string/pref_expert_options_summary"
- android:title="@string/pref_expert_options"
- android:key="expert">
- <PreferenceCategory android:title="@string/pref_encryption_settings" >
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="force_encryption"
- android:summary="@string/pref_force_encryption_summary"
- android:title="@string/pref_force_encryption" />
+ android:title="@string/pref_expert_options">
+ <PreferenceCategory android:title="@string/pref_security_settings">
<CheckBoxPreference
android:defaultValue="false"
android:key="dont_save_encrypted"
android:summary="@string/pref_dont_save_encrypted_summary"
- android:title="@string/pref_dont_save_encrypted" />
+ android:title="@string/pref_dont_save_encrypted"/>
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="dont_trust_system_cas"
+ android:summary="@string/pref_dont_trust_system_cas_summary"
+ android:title="@string/pref_dont_trust_system_cas_title"/>
+ <Preference
+ android:key="remove_trusted_certificates"
+ android:summary="@string/pref_remove_trusted_certificates_summary"/>
+ </PreferenceCategory>
+ <PreferenceCategory
+ android:key="connection_options"
+ android:title="@string/pref_connection_options">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="show_connection_options"
+ android:summary="@string/pref_show_connection_options_summary"
+ android:title="@string/pref_show_connection_options"/>
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_input_options">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="enter_is_send"
+ android:summary="@string/pref_enter_is_send_summary"
+ android:title="@string/pref_enter_is_send"/>
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="display_enter_key"
+ android:summary="@string/pref_display_enter_key_summary"
+ android:title="@string/pref_display_enter_key"/>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_input_options">
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="enter_is_send"
- android:title="@string/pref_enter_is_send"
- android:summary="@string/pref_enter_is_send_summary" />
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="display_enter_key"
- 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" >
+ <PreferenceCategory android:title="@string/pref_presence_settings">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="away_when_screen_off"
+ android:summary="@string/pref_away_when_screen_off_summary"
+ android:title="@string/pref_away_when_screen_off"/>
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="xa_on_silent_mode"
+ android:summary="@string/pref_xa_on_silent_mode_summary"
+ android:title="@string/pref_xa_on_silent_mode"/>
+ </PreferenceCategory>
+ <PreferenceCategory android:key="other_expert_settings" android:title="@string/pref_expert_options_other">
+ <CheckBoxPreference
+ android:key="autojoin"
+ android:defaultValue="true"
+ android:title="@string/pref_autojoin"
+ android:summary="@string/pref_autojoin_summary"
+ />
<CheckBoxPreference
android:defaultValue="false"
android:key="indicate_received"
android:summary="@string/pref_use_indicate_received_summary"
- android:title="@string/pref_use_indicate_received" />
+ android:title="@string/pref_use_indicate_received"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="keep_foreground_service"
- android:title="@string/pref_keep_foreground_service"
- android:summary="@string/pref_keep_foreground_service_summary" />
+ android:summary="@string/pref_keep_foreground_service_summary"
+ android:title="@string/pref_keep_foreground_service"/>
+ <de.thedevstack.conversationsplus.ui.ExportLogsPreference
+ android:key="export_logs"
+ android:summary="@string/pref_export_logs_summary"
+ android:title="@string/pref_export_logs"/>
<de.thedevstack.conversationsplus.ui.preferences.LogInformationPreference
android:summary="@string/pref_show_logcat_summary"
android:title="@string/pref_show_logcat_title"/>
+ <CheckBoxPreference
+ android:defaultValue="@bool/omemo_enabled"
+ android:key="omemo_enabled"
+ android:summary="@string/pref_omemo_enabled_summary"
+ android:title="@string/pref_omemo_enabled_title"/>
</PreferenceCategory>
</PreferenceScreen>
@@ -235,9 +263,9 @@
android:defaultValue="false"
android:key="never_send"
android:summary="@string/pref_never_send_crash_summary"
- android:title="@string/pref_never_send_crash" />
+ android:title="@string/pref_never_send_crash"/>
</PreferenceCategory>
- <de.thedevstack.conversationsplus.ui.AboutPreference
- android:summary="@string/pref_about_conversations_summary"
- android:title="@string/title_activity_about" />
+ <de.thedevstack.conversationsplus.ui.AboutPreference
+ android:summary="@string/pref_about_conversations_summary"
+ android:title="@string/title_activity_about"/>
</PreferenceScreen>