diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-16 21:55:02 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-16 21:55:02 +0100 |
| commit | 4f0061293e1d8e90d2828deeb6b72d8a2c8bd509 (patch) | |
| tree | a365b75f1d8cd49639b0e6b597aeb48ea82b1773 /src/main/res/xml/preferences.xml | |
| parent | f49b979cbe96a81c7f20f209bec7e5a1c9f3c24f (diff) | |
| parent | c26335f3e366110366eb89025a42875bcb7840a9 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/xml/preferences.xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 20ceb634..26ab27bd 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -17,6 +17,26 @@ android:summary="@string/pref_xmpp_resource_summary" android:title="@string/pref_xmpp_resource" /> + <ListPreference + android:defaultValue="2" + android:entries="@array/confirm_strings" + android:entryValues="@array/confirm_values" + android:key="confirm_messages_list" + android:summary="@string/pref_confirm_messages_summary" + android:title="@string/pref_confirm_messages" /> + + <CheckBoxPreference + android:defaultValue="false" + android:key="chat_states" + android:summary="@string/pref_chat_states_summary" + 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"/> + </PreferenceCategory> + <PreferenceCategory android:title="@string/pref_file_transfer_category"> <PreferenceScreen android:summary="@string/pref_accept_files_summary" android:title="@string/pref_accept_files"> @@ -42,6 +62,16 @@ android:title="@string/pref_accept_files_download" /> </PreferenceScreen> + <EditTextPreference + android:title="@string/pref_img_file_transfer" + android:summary="@string/pref_file_transfer_folder_summary" + android:key="file_transfer_folder" + android:defaultValue="Conversations+"/> + <EditTextPreference + android:title="@string/pref_file_transfer" + android:summary="@string/pref_img_file_transfer_summary" + android:key="img_transfer_folder" + android:defaultValue="Conversations+"/> <ListPreference android:defaultValue="ASK" @@ -50,25 +80,6 @@ android:key="resize_picture" android:summary="@string/pref_resize_picture_summary" android:title="@string/pref_resize_picture"/> - - <ListPreference - android:defaultValue="2" - android:entries="@array/confirm_strings" - android:entryValues="@array/confirm_values" - android:key="confirm_messages_list" - android:summary="@string/pref_confirm_messages_summary" - android:title="@string/pref_confirm_messages" /> - - <CheckBoxPreference - android:defaultValue="false" - android:key="chat_states" - android:summary="@string/pref_chat_states_summary" - 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"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_notification_settings" > <PreferenceScreen |