aboutsummaryrefslogtreecommitdiffstats
path: root/res/xml/preferences.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/xml/preferences.xml')
-rw-r--r--res/xml/preferences.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 7339565e..6268350a 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -5,7 +5,7 @@
<CheckBoxPreference
android:key="grant_new_contacts"
android:title="Grant presence updates"
- android:summary="Preemptivly grant and ask for presence subscription for contacts you created"
+ android:summary="Preemptively grant and ask for presence subscription for contacts you created"
android:defaultValue="true"
/>
<ListPreference
@@ -15,6 +15,13 @@
android:entries="@array/resources"
android:entryValues="@array/resources"
android:defaultValue="Mobile"/>
+ <ListPreference
+ android:key="auto_accept_file_size"
+ android:title="Accept files"
+ android:summary="Automatically accept files smaller than"
+ android:entries="@array/filesizes"
+ android:entryValues="@array/filesizes_values"
+ android:defaultValue="524288"/>
</PreferenceCategory>
<PreferenceCategory
android:title="Notification Settings">
@@ -41,6 +48,11 @@
android:key="notify_in_conversation_when_highlighted"
android:title="Conference notification"
android:summary="Always notify when a new conference message arrives instead of only when highlighted"/>
+ <CheckBoxPreference
+ android:key="notification_grace_period_after_carbon_received"
+ android:title="Notification grace period"
+ android:summary="Disable notifications for a short time after a carbon copy was received"
+ android:defaultValue="true"/>
</PreferenceCategory>
<PreferenceCategory
android:title="UI Options">