diff options
Diffstat (limited to 'src/main/res/xml/preferences.xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 100 |
1 files changed, 63 insertions, 37 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 96be892e..4faf1df2 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -16,6 +16,17 @@ android:key="resource" android:summary="@string/pref_xmpp_resource_summary" android:title="@string/pref_xmpp_resource"/> + <CheckBoxPreference + android:defaultValue="true" + android:key="parse_emoticons" + android:summary="@string/pref_parse_emoticons_summary" + android:title="@string/pref_parse_emoticons"/> + </PreferenceCategory> + <PreferenceCategory android:title="@string/pref_privacy_security"> + <PreferenceScreen + android:summary="@string/pref_privacy_summary" + android:title="@string/pref_privacy"> + <PreferenceCategory android:title="@string/pref_general"> <ListPreference android:defaultValue="2" android:entries="@array/confirm_strings" @@ -31,9 +42,58 @@ android:title="@string/pref_chat_states"/> <CheckBoxPreference android:defaultValue="true" - android:key="parse_emoticons" - android:summary="@string/pref_parse_emoticons_summary" - android:title="@string/pref_parse_emoticons"/> + android:key="send_entity_time" + android:summary="@string/pref_entity_time_summary" + android:title="@string/pref_entity_time"/> + <CheckBoxPreference + android:defaultValue="true" + android:key="send_software_info" + android:summary="@string/pref_software_info_summary" + android:title="@string/pref_software_info"/> + <CheckBoxPreference + android:defaultValue="true" + android:key="send_os_info" + android:dependency="send_software_info" + android:summary="@string/pref_send_os_info_summary" + android:title="@string/pref_send_os_info"/> + </PreferenceCategory> + <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"/> + <CheckBoxPreference + android:dependency="xa_on_silent_mode" + android:defaultValue="false" + android:key="treat_vibrate_as_silent" + android:title="@string/pref_treat_vibrate_as_silent" + android:summary="@string/pref_treat_vibrate_as_silent_summary"/> + </PreferenceCategory> + </PreferenceScreen> + <PreferenceScreen android:title="@string/pref_security_settings"> + <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"/> + <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" + android:title="@string/pref_remove_trusted_certificates_title"/> + </PreferenceCategory> + </PreferenceScreen> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_file_transfer_category"> <PreferenceScreen @@ -184,22 +244,6 @@ android:key="expert" android:summary="@string/pref_expert_options_summary" 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"/> - <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" - android:title="@string/pref_remove_trusted_certificates_title"/> - </PreferenceCategory> <PreferenceCategory android:key="connection_options" android:title="@string/pref_connection_options"> @@ -221,24 +265,6 @@ android:summary="@string/pref_display_enter_key_summary" android:title="@string/pref_display_enter_key"/> </PreferenceCategory> - <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"/> - <CheckBoxPreference - android:dependency="xa_on_silent_mode" - android:defaultValue="false" - android:key="treat_vibrate_as_silent" - android:title="@string/pref_treat_vibrate_as_silent" - android:summary="@string/pref_treat_vibrate_as_silent_summary"/> - </PreferenceCategory> <PreferenceCategory android:key="other_expert_settings" android:title="@string/pref_expert_options_other"> <CheckBoxPreference android:key="autojoin" |