aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-04-11 23:00:31 +0200
committersteckbrief <steckbrief@chefmail.de>2015-04-11 23:00:31 +0200
commitdeac0df707099ef7ef6bd2420eb1df13a5a83ca1 (patch)
tree8b087218ad07c5511fe159dbafd5b4be64d23ce1 /src/main/res/xml
parent17779e77002e99dabb73f4fa8f9596e9d220319b (diff)
parent82bfd8ac335b84613677ff857cf27c455fdf512d (diff)
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/res/xml')
-rw-r--r--src/main/res/xml/preferences.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index a9707e44..206fc6b4 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -31,6 +31,12 @@
android:title="@string/pref_confirm_messages" />
<CheckBoxPreference
+ android:defaultValue="true"
+ android:key="confirm_read_message"
+ android:summary="@string/pref_confirm_read_messages_summary"
+ android:title="@string/pref_confirm_read_messages" />
+
+ <CheckBoxPreference
android:defaultValue="false"
android:key="chat_states"
android:summary="@string/pref_chat_states_summary"