diff options
| author | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
| commit | 115a3a3396ac608a1ba855ab72a2ed5ecf28dc29 (patch) | |
| tree | b5862a7ffaa9bdd15661f636669778ace05b6b7c /src/main/res/xml/preferences.xml | |
| parent | 26850fe48b1c772cb078276c3e8b4287689d17b6 (diff) | |
| parent | e9494af098e6d3dad4f0a5328ae7342664ce853c (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/res/xml/preferences.xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index d8aaa00a7..5da8217eb 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -8,20 +8,6 @@ android:summary="@string/pref_grant_presence_updates_summary" android:title="@string/pref_grant_presence_updates"/> - <ListPreference - android:defaultValue="1048576" - android:entries="@array/filesizes" - android:entryValues="@array/filesizes_values" - 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" @@ -85,7 +71,28 @@ android:ringtoneType="notification" android:summary="@string/pref_sound_summary" android:title="@string/pref_sound"/> - + </PreferenceCategory> + <PreferenceCategory + android:title="@string/pref_attachments"> + <ListPreference + android:defaultValue="1048576" + android:entries="@array/filesizes" + android:entryValues="@array/filesizes_values" + 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="false" + android:key="return_to_previous" + android:title="@string/pref_return_to_previous" + android:summary="@string/pref_return_to_previous_summary"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_ui_options"> <CheckBoxPreference |