diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-03 15:50:32 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-03 15:50:32 +0200 |
| commit | 657df841551cecc8ade139c6313fdee6b4d01ebd (patch) | |
| tree | b49a6abfe28cea9975385eb54fa05ed612dad70f /res/xml | |
| parent | 41dde747c2b9cfe24469dee3ce888cfe20071476 (diff) | |
| parent | cedc1f40b37aaecfef60f0bf63d30d24fa280e82 (diff) | |
Merge branch 'feature/xep-0333' into development
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/preferences.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 4cc2f822..bf304161 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -22,6 +22,14 @@ android:entries="@array/filesizes" android:entryValues="@array/filesizes_values" android:defaultValue="524288"/> + <ListPreference + android:key="auto_acknowledge_messages" + android:title="@string/pref_auto_acknowledge_messages" + android:summary="@string/pref_auto_acknowledge_messages_summary" + android:entries="@array/message_acks" + android:entryValues="@array/message_acks_values" + android:defaultValue="2" + /> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_notification_settings"> |