From 87010e6094cc35ece98d3beadbbfbc59ea0a25b3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 28 Sep 2014 16:33:25 +0200
Subject: more improvments for new notification service

---
 res/xml/preferences.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 024335f1..5af789c0 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
-- 
cgit v1.2.3


From 511b7a53f41f8254449e6c2c6eff795f728e7a33 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 29 Sep 2014 18:28:13 +0200
Subject: notifiy only when necessary

---
 res/xml/preferences.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'res/xml')

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5af789c0..eccc8bae 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -89,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
@@ -105,4 +105,4 @@
             android:title="@string/pref_never_send_crash" />
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3