diff options
author | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
commit | 1515d31682ad75a50c5c06b9569ac21dbd15070c (patch) | |
tree | ad068c0b693b7b02f786729b08ee59840570fc4e /src/main/res/xml/preferences.xml | |
parent | 5d0c80ee5bef204b1bdefcb45adc9f2cb283553e (diff) | |
parent | 95db6db935ff58ce2731ab535e3758a13dd5b68b (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/xml/preferences.xml')
-rw-r--r-- | src/main/res/xml/preferences.xml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 4cc22e097..aac580a98 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -15,7 +15,13 @@ android:key="auto_accept_file_size" android:summary="@string/pref_accept_files_summary" android:title="@string/pref_accept_files"/> - + <ListPreference + android:defaultValue="auto" + android:entries="@array/picture_compression_entries" + android:entryValues="@array/picture_compression_values" + android:key="picture_compression" + android:summary="@string/pref_picture_compression_summary" + android:title="@string/pref_picture_compression"/> <CheckBoxPreference android:defaultValue="true" android:key="confirm_messages" @@ -75,19 +81,13 @@ android:summary="@string/pref_sound_summary" android:title="@string/pref_sound"/> - <CheckBoxPreference - android:defaultValue="false" - android:dependency="show_notification" - android:key="always_notify_in_conference" - android:summary="@string/pref_conference_notifications_summary" - android:title="@string/pref_conference_notifications"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_ui_options"> <CheckBoxPreference android:defaultValue="false" android:key="use_white_background" - android:title="@string/pref_use_white_background" - android:summary="@string/pref_use_white_background_summary"/> + android:summary="@string/pref_use_white_background_summary" + android:title="@string/pref_use_white_background"/> <CheckBoxPreference android:defaultValue="false" android:key="use_larger_font" @@ -168,13 +168,13 @@ android:title="@string/pref_remove_trusted_certificates_title"/> </PreferenceCategory> <PreferenceCategory - android:title="@string/pref_connection_options" - android:key="connection_options"> + android:key="connection_options" + android:title="@string/pref_connection_options"> <CheckBoxPreference android:defaultValue="false" android:key="use_tor" - android:title="@string/pref_use_tor" - android:summary="@string/pref_use_tor_summary"/> + android:summary="@string/pref_use_tor_summary" + android:title="@string/pref_use_tor"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_input_options"> <CheckBoxPreference @@ -207,9 +207,9 @@ android:summary="@string/pref_keep_foreground_service_summary" android:title="@string/pref_keep_foreground_service"/> <eu.siacs.conversations.ui.ExportLogsPreference - android:key="export_logs" - android:title="@string/pref_export_logs" - android:summary="@string/pref_export_logs_summary"/> + android:key="export_logs" + android:summary="@string/pref_export_logs_summary" + android:title="@string/pref_export_logs"/> </PreferenceCategory> </PreferenceScreen> <CheckBoxPreference |