aboutsummaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-10 10:52:21 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-10 10:52:21 +0200
commit15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch)
tree9a2152390f39c4a9c79490a0938f57fe728140f2 /res/xml
parentae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff)
parent331be08859d68fa6a034b39c674fd7bb929c4a5c (diff)
Merge branch 'development'
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/preferences.xml24
1 files changed, 9 insertions, 15 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 024335f1..eccc8bae 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -52,15 +52,9 @@
<CheckBoxPreference
android:dependency="show_notification"
- android:key="notify_in_conversation_when_highlighted"
+ android:key="always_notify_in_conference"
android:summary="@string/pref_conference_notifications_summary"
android:title="@string/pref_conference_notifications" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:dependency="show_notification"
- android:key="notification_grace_period_after_carbon_received"
- android:summary="@string/pref_notification_grace_period_summary"
- android:title="@string/pref_notification_grace_period" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_ui_options" >
<CheckBoxPreference
@@ -95,13 +89,13 @@
android:summary="@string/pref_dont_save_encrypted_summary"
android:title="@string/pref_dont_save_encrypted" />
</PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_expert_options_other" >
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="indicate_received"
- android:summary="@string/pref_use_indicate_received_summary"
- android:title="@string/pref_use_indicate_received" />
- </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_expert_options_other" >
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="indicate_received"
+ android:summary="@string/pref_use_indicate_received_summary"
+ android:title="@string/pref_use_indicate_received" />
+ </PreferenceCategory>
</PreferenceScreen>
<CheckBoxPreference
@@ -111,4 +105,4 @@
android:title="@string/pref_never_send_crash" />
</PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen> \ No newline at end of file