No sound or vibration during quiet hours

Closes #200

src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java

@@ -11,7 +11,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
 
 import org.joda.time.DateTime;
 import org.tasks.R;
@@ -20,8 +19,6 @@ import org.tasks.ui.TimePreference;
 
 import java.text.DateFormat;
 
-import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
-
 public class ReminderPreferences extends InjectingPreferenceActivity {
 
     @Override
@@ -32,19 +29,11 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
 
         initializeRingtonePreference();
         initializeTimePreference(R.string.p_rmd_time, R.string.rmd_EPr_rmd_time_desc);
-
-        if (atLeastLollipop()) {
-            PreferenceScreen preferenceScreen = getPreferenceScreen();
-            preferenceScreen.removePreference(findPreference(getString(R.string.p_rmd_enable_quiet)));
-            preferenceScreen.removePreference(findPreference(getString(R.string.p_rmd_quietStart)));
-            preferenceScreen.removePreference(findPreference(getString(R.string.p_rmd_quietEnd)));
-        } else {
-            initializeTimePreference(R.string.p_rmd_quietStart, R.string.rmd_EPr_quiet_hours_start_desc);
-            initializeTimePreference(R.string.p_rmd_quietEnd, R.string.rmd_EPr_quiet_hours_end_desc);
-        }
+        initializeTimePreference(R.string.p_rmd_quietStart, null);
+        initializeTimePreference(R.string.p_rmd_quietEnd, null);
     }
 
-    private void initializeTimePreference(int key, final int summaryRes) {
+    private void initializeTimePreference(int key, final Integer summaryRes) {
         Preference preference = findPreference(getString(key));
         preference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
@@ -56,9 +45,9 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
         setPreference(preference, summaryRes, ((TimePreference) preference).getMillisOfDay());
     }
 
-    private void setPreference(Preference preference, final int summaryRes, int millisOfDay) {
+    private void setPreference(Preference preference, final Integer summaryRes, int millisOfDay) {
         String setting = DateFormat.getTimeInstance(DateFormat.SHORT).format(new DateTime().withMillisOfDay(millisOfDay).toDate());
-        preference.setSummary(getString(summaryRes, setting));
+        preference.setSummary(summaryRes == null ? setting : getString(summaryRes, setting));
     }
 
     private void initializeRingtonePreference() {

src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java

@@ -113,7 +113,7 @@ public class ShowNotificationReceiver extends InjectingBroadcastReceiver {
         }
 
         // quiet hours? unless alarm clock
-        boolean quietHours = !(type == ReminderService.TYPE_ALARM || type == ReminderService.TYPE_DUE) && isQuietHours(preferences);
+        boolean quietHours = isQuietHours(preferences);
 
         PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
@@ -139,7 +139,6 @@ public class ShowNotificationReceiver extends InjectingBroadcastReceiver {
                     .addAction(R.drawable.ic_action_alarm_white, context.getResources().getString(R.string.rmd_NoA_snooze), snoozePendingIntent);
         }
 
-
         Notification notification = builder.build();
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
         if (preferences.getBoolean(R.string.p_rmd_persistent, true)) {
@@ -184,11 +183,7 @@ public class ShowNotificationReceiver extends InjectingBroadcastReceiver {
 
         boolean soundIntervalOk = checkLastNotificationSound();
 
-        // quiet hours = no sound
-        if (quietHours || callState != TelephonyManager.CALL_STATE_IDLE) {
-            notification.sound = null;
-            voiceReminder = false;
-        } else {
+        if (!quietHours && callState == TelephonyManager.CALL_STATE_IDLE) {
             String notificationPreference = preferences.getStringValue(R.string.p_rmd_ringtone);
             if (audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0) {
                 notification.sound = null;
@@ -204,18 +199,16 @@ public class ShowNotificationReceiver extends InjectingBroadcastReceiver {
             }
         }
 
-        // quiet hours && ! due date or snooze = no vibrate
-        if (quietHours && !(type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_SNOOZE)) {
+        if (preferences.getBoolean(R.string.p_rmd_vibrate, true) && soundIntervalOk) {
+            notification.vibrate = new long[]{0, 1000, 500, 1000, 500, 1000};
+        } else {
             notification.vibrate = null;
-        } else if (callState != TelephonyManager.CALL_STATE_IDLE) {
+        }
+
+        if (quietHours || callState != TelephonyManager.CALL_STATE_IDLE) {
+            notification.sound = null;
             notification.vibrate = null;
-        } else {
-            if (preferences.getBoolean(R.string.p_rmd_vibrate, true)
-                    && audioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_NOTIFICATION) && soundIntervalOk) {
-                notification.vibrate = new long[]{0, 1000, 500, 1000, 500, 1000};
-            } else {
-                notification.vibrate = null;
-            }
+            voiceReminder = false;
         }
 
         singleThreadVoicePool.submit(new NotificationRunnable(ringTimes, notificationId, notification, voiceReminder,

src/main/res/values-bg-rBG/strings.xml

@@ -353,9 +353,7 @@
 	<string name="rmd_NoA_snooze">Отложи</string>
 	<string name="rmd_NoA_dlg_title">Напомняне:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Тихи часове начало</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Уведомленията ще бъдат тихи след %s.\nЗабележка: вибрациите се контролират от настройките по-долу</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Тихи часове край</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Уведомления ще престанат да бъдат тихи на %s</string>
 	<string name="rmd_EPr_rmd_time_title">Напомняне по подразбиране</string>
 	<string name="rmd_EPr_rmd_time_desc">Уведомления за задачи без крайни срокове ще се показват на %s</string>
 	<string name="rmd_EPr_persistent_title">Настойчивост на уведомленията</string>

src/main/res/values-ca/strings.xml

@@ -209,9 +209,7 @@
 	<string name="rmd_NoA_done">Acabat</string>
 	<string name="rmd_NoA_snooze">Adorm</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Inici de Silenci</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Cap notificació apareixerà després %s</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Final de Silenci</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Les notificacions sortirant començant a %s</string>
 	<string name="rmd_EPr_persistent_title">Persistència de Notificació</string>
 	<string name="rmd_EPr_persistent_desc_true">Les notificacions han que ser vistes individualment per ser descartades</string>
 	<string name="rmd_EPr_persistent_desc_false">Les notificacions poden ser descartades amb el botó \"Descarta Tot\"</string>

src/main/res/values-cs/strings.xml

@@ -342,7 +342,6 @@
 	<string name="rmd_NoA_dlg_title">Připomenutí:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Nerušit od</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Nerušit do</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Upozorňování začne upomínat od %s</string>
 	<string name="rmd_EPr_rmd_time_title">Výchozí upomínka</string>
 	<string name="rmd_EPr_rmd_time_desc">Upozornění na úkoly bez času dokončení se objeví v %s</string>
 	<string name="rmd_EPr_persistent_title">Trvání upozornění</string>

src/main/res/values-da/strings.xml

@@ -181,7 +181,6 @@
 	<string name="rmd_NoA_done">Allerede udført!</string>
 	<string name="rmd_NoA_snooze">Slumrefunktion...</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Stille timer start</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Ingen påmindelser vil blive vist efter %s</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Stille timer slut</string>
 	<string name="rmd_EPr_persistent_desc_true">Påmindelser skal vises individuelt for at blive ryddet</string>
 	<string name="rmd_EPr_defaultRemind_title">Tilfældige påmindelser</string>

src/main/res/values-de/strings.xml

@@ -350,9 +350,7 @@
 	<string name="rmd_NoA_snooze">Schlummern</string>
 	<string name="rmd_NoA_dlg_title">Erinnerung:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Stille Stunden beginnen.</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Benachrichtigungen sind lautlos nach %s.\nHinweis: Vibrieren wird durch Einstellungen weiter unten gesteuert!</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Ruhezeiten enden</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Benachrichtigungen werden nicht mehr lautlos sein ab %s</string>
 	<string name="rmd_EPr_rmd_time_title">Standard-Erinnerung</string>
 	<string name="rmd_EPr_rmd_time_desc">Benachrichtigungen für Aufgaben ohne Fälligkeit werden um %s angezeigt</string>
 	<string name="rmd_EPr_persistent_title">Hartnäckigkeit von Meldungen</string>

src/main/res/values-el/strings.xml

@@ -347,9 +347,7 @@
 	<string name="rmd_NoA_snooze">Αναβολή</string>
 	<string name="rmd_NoA_dlg_title">Υπενθύμιση:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Ξεκίνησε η ώρα ησυχίας </string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Σίγαση υπενθυμίσεων μετά τις %s.\nΣημείωση: η δόνηση ελέγχεται από τη ρύθμιση   \"Δόνηση ειδοποιήσεων\"</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Τέλος ώρας κοινής ησυχίας</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Οι ειδοποιήσεις θα σταματήσουν να είναι σε σίγαση στις %s</string>
 	<string name="rmd_EPr_rmd_time_title">Προκαθορισμένη υπενθύμιση</string>
 	<string name="rmd_EPr_rmd_time_desc">Ειδοποιήσεις για εργασίες χωρίς ώρα λήξης θα φαίνονται στις %s</string>
 	<string name="rmd_EPr_persistent_title">Επιμονή ειδοποίησης</string>

src/main/res/values-es/strings.xml

@@ -347,9 +347,7 @@
 	<string name="rmd_NoA_snooze">Dilación</string>
 	<string name="rmd_NoA_dlg_title">Recordatorio:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">El horario en silencio empieza</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Notificaciones serán silenciadas después de %s.\nNota: las vibraciones están controladas según la configuración \"Vibrar en alerta\"</string>
 	<string name="rmd_EPr_quiet_hours_end_title">El horario en silencio termina</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Las notificaciones dejarán de estar en silencio desde las %s</string>
 	<string name="rmd_EPr_rmd_time_title">Aviso por defecto</string>
 	<string name="rmd_EPr_rmd_time_desc">Notificaciones para tareas sin fecha límites aparecerán a %s</string>
 	<string name="rmd_EPr_persistent_title">Persistencia de notificación</string>

src/main/res/values-fr/strings.xml

@@ -346,9 +346,7 @@
 	<string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
 	<string name="rmd_NoA_dlg_title">Rappel :</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Début des heures de repos</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Les notifications seront silencieuses après %s.\nNote : les vibrations sont contrôlées par le paramètre Vibrations</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Fin des heures de repos</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Les notifications ne seront plus silencieuses à partir de %s</string>
 	<string name="rmd_EPr_rmd_time_title">Rappel par défaut</string>
 	<string name="rmd_EPr_rmd_time_desc">Les notifications pour les tâches sans échéances apparaîtront à %s</string>
 	<string name="rmd_EPr_persistent_title">Persistance de la notification</string>

src/main/res/values-it/strings.xml

@@ -309,9 +309,7 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	<string name="rmd_NoA_snooze">Rimanda...</string>
 	<string name="rmd_NoA_dlg_title">Promemoria:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Ora inizio silenzio</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Nessuna notifica apparirà dopo le %s</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Ora fine silenzio</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Le notifiche smetteranno di essere silenziose dopo le %s</string>
 	<string name="rmd_EPr_rmd_time_title">Promemoria predefiniti</string>
 	<string name="rmd_EPr_rmd_time_desc">Le notifiche per le attività senza scadenza appariranno alle %s</string>
 	<string name="rmd_EPr_persistent_title">Notifica Persistente</string>

src/main/res/values-iw/strings.xml

@@ -346,9 +346,7 @@
 	<string name="rmd_NoA_snooze">השתק</string>
 	<string name="rmd_NoA_dlg_title">תזכורת:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">תחילת שעות השקט</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">האתראות תוחרשנה אחרי %s.\nשים לב: הגדרות הן חתחת \"רטט  בזמן התראה\"!</string>
 	<string name="rmd_EPr_quiet_hours_end_title">סיום שעות השקט</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">החרשת האתראות תחדל החל מ %s</string>
 	<string name="rmd_EPr_rmd_time_title">תזכורת ברירת מחדל</string>
 	<string name="rmd_EPr_rmd_time_desc">התראות משימות ללא מועד יעד תגענה ב-%s</string>
 	<string name="rmd_EPr_persistent_title">התמדת התראות</string>

src/main/res/values-ja/strings.xml

@@ -355,9 +355,7 @@
 	<string name="rmd_NoA_snooze">スヌーズ</string>
 	<string name="rmd_NoA_dlg_title">お知らせ.</string>
 	<string name="rmd_EPr_quiet_hours_start_title">消音時間の始まり</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">%s 以降、通知音は鳴りません</string>
 	<string name="rmd_EPr_quiet_hours_end_title">消音時間の終わり</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">通知を行う時間帯の開始 %s</string>
 	<string name="rmd_EPr_rmd_time_title">標準リマインダー</string>
 	<string name="rmd_EPr_rmd_time_desc">期限の時間がないタスクの通知は %s に表示されます</string>
 	<string name="rmd_EPr_persistent_title">通知の持続</string>

src/main/res/values-ko/strings.xml

@@ -354,9 +354,7 @@
 	<string name="rmd_NoA_snooze">알림 잠시 미루기</string>
 	<string name="rmd_NoA_dlg_title">알림:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">알림 꺼짐 시작 시간</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">%s 후에는 알림을 끕니다. (진동은 알람 설정의 진동 설정을 따릅니다)</string>
 	<string name="rmd_EPr_quiet_hours_end_title">알림 꺼짐 종료 시간</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">%s 부터 알림 기능이 켜집니다</string>
 	<string name="rmd_EPr_rmd_time_title">기본 알림 설정</string>
 	<string name="rmd_EPr_rmd_time_desc">마감일이 없는 일정 알림은 %s 에 나타날 것입니다.</string>
 	<string name="rmd_EPr_persistent_title">알림 지속 시간</string>

src/main/res/values-nl/strings.xml

@@ -349,9 +349,7 @@
 	<string name="rmd_NoA_snooze">Sluimeren...</string>
 	<string name="rmd_NoA_dlg_title">Herinnering:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Rustperiode begint</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Waarschuwingen geluidloos na %s.\nOpmerking: trillen wordt via onderstaande instellingen ingesteld!</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Rustperiode eindigt</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Waarschuwingsgeluid weer geactiveerd om %s</string>
 	<string name="rmd_EPr_rmd_time_title">Standaard herinnering</string>
 	<string name="rmd_EPr_rmd_time_desc">Waarschuwingen voor taken zonder eindtijd verschijnen om %s</string>
 	<string name="rmd_EPr_persistent_title">Herinneringen aanhouden</string>

src/main/res/values-pl/strings.xml

@@ -351,9 +351,7 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g
 	<string name="rmd_NoA_snooze">Wstrzymaj...</string>
 	<string name="rmd_NoA_dlg_title">Przypomnienie:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Początek czasu wyciszenia</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Powiadomienia będą wyciszone po %s.\nUwaga: wibracje są kontrolowane przez ustawienia poniżej!</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Koniec czasu wyciszenia</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Powiadomienia przestaną być wyciszonre, począwszy od %s</string>
 	<string name="rmd_EPr_rmd_time_title">Domyślne przypomnienie</string>
 	<string name="rmd_EPr_rmd_time_desc">Powiadomienia zadań bez odpowiedniego czasu pojawi się na %s</string>
 	<string name="rmd_EPr_persistent_title">Wytrwałość powiadomienia</string>

src/main/res/values-pt-rBR/strings.xml

@@ -345,9 +345,7 @@
 	<string name="rmd_NoA_snooze">Adiar</string>
 	<string name="rmd_NoA_dlg_title">Lembrete:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Começam as horas calmas</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Notificações irão silenciar depois de %s.\nNota: vibrações são controladas pelo Vibrate na configuração de alarme.</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Fim das horas calmas</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">As notificações ficarão normais (sonoras) a partir de %s</string>
 	<string name="rmd_EPr_rmd_time_title">Lembrete padrão</string>
 	<string name="rmd_EPr_rmd_time_desc">Notificações de tarefas sem tempo de vencimento vão aparecer em %s</string>
 	<string name="rmd_EPr_persistent_title">Notificação persistente</string>

src/main/res/values-pt/strings.xml

@@ -351,9 +351,7 @@ das tarefas através de um backup em Definições->Sincronização e backup-&
 	<string name="rmd_NoA_done">Terminada</string>
 	<string name="rmd_NoA_dlg_title">Lembrete:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Início da hora de silêncio</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">As notificações serão silenciadas após %s.\nAs vibrações são controladas pela definição \"Vibrar no alerta\"</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Fim das horas de silêncio</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">As notificações será restauradas em %s</string>
 	<string name="rmd_EPr_rmd_time_title">Lembrete predefinido</string>
 	<string name="rmd_EPr_rmd_time_desc">As notificações para tarefas sem data limite aparecerão em %s</string>
 	<string name="rmd_EPr_persistent_title">Persistência da notificação</string>

src/main/res/values-ru/strings.xml

@@ -352,9 +352,7 @@
 	<string name="rmd_NoA_snooze">Повтор</string>
 	<string name="rmd_NoA_dlg_title">Напоминания:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Начало тихих часов</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Уведомления будут беззвучными после %s.\nПримечание: вибрация управляется настройками ниже!</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Конец тихих часов</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Уведомления перестануть быть беззвучными начиная с %s.</string>
 	<string name="rmd_EPr_rmd_time_title">Напоминание по умолчанию</string>
 	<string name="rmd_EPr_rmd_time_desc">Уведомления для задач без срока выполнения появятся в %s</string>
 	<string name="rmd_EPr_persistent_title">Постоянность уведомления</string>

src/main/res/values-sl-rSI/strings.xml

@@ -352,9 +352,7 @@
 	<string name="rmd_NoA_snooze">Dremež</string>
 	<string name="rmd_NoA_dlg_title">Opomnik:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Tihe ure se začnejo ob</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Obvestila bodo utišana po %s.\n Obvestilo: vibriranje določajo nastavitve \"Vibriranje ob opozorilih\"</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Tihe ure se končajo ob</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Obvestila ne bodo več utišana od %s</string>
 	<string name="rmd_EPr_rmd_time_title">Privzeti opomnik ob</string>
 	<string name="rmd_EPr_rmd_time_desc">Obvestila o opravkih brez dospelosti se prikažejo ob %s</string>
 	<string name="rmd_EPr_persistent_title">Vztrajnost obvestil</string>

src/main/res/values-sv/strings.xml

@@ -343,9 +343,7 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="rmd_NoA_snooze">Vänta...</string>
 	<string name="rmd_NoA_dlg_title">Påminnelse:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Tyst period börjar</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Inga varsel visas efter %s</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Tyst period slutar</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Påminnelser är ljudlösa med början %s</string>
 	<string name="rmd_EPr_rmd_time_title">Standardpåminnelse</string>
 	<string name="rmd_EPr_rmd_time_desc">Påminnelser om uppgifter utan sluttid visas %s</string>
 	<string name="rmd_EPr_persistent_title">Varselinställningar</string>

src/main/res/values-tr/strings.xml

@@ -312,9 +312,7 @@
 	<string name="rmd_NoA_snooze">Ertele</string>
 	<string name="rmd_NoA_dlg_title">Hatırlatıcı:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Sessiz saatlerin başlangıcı</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">%s sonrasında bildirimler sessizleştirilecek.\n Not: titreşimler aşağıdaki ayarla belirlenecek.</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Sessiz saatlerin sonu</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Bildirim sesleri %s den itibaren sessiz olmayacak</string>
 	<string name="rmd_EPr_rmd_time_title">Öntanımlı Hatırlatma</string>
 	<string name="rmd_EPr_rmd_time_desc">Görev bildirimleri son tarihler olmadan gösterilecek: %s</string>
 	<string name="rmd_EPr_persistent_title">Bildirim Sürekliliği</string>

src/main/res/values-uk/strings.xml

@@ -354,9 +354,7 @@
 	<string name="rmd_NoA_snooze">Відкласти</string>
 	<string name="rmd_NoA_dlg_title">Нагадування:</string>
 	<string name="rmd_EPr_quiet_hours_start_title">Тихі години стартують</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">Повідомлення будуть беззвучними після %s.\n Примітка:. Вібрація управляється налаштуваннями нижче!</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Тихі години закінчуються</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">Сповіщення перестануть бути беззвучними починаючи з %s.</string>
 	<string name="rmd_EPr_rmd_time_title">Нагадування по замовчуванню</string>
 	<string name="rmd_EPr_rmd_time_desc">Сповіщення для задач без терміну виконання з\'являться у %s</string>
 	<string name="rmd_EPr_persistent_title">Постійність сповіщення</string>

src/main/res/values-zh-rCN/strings.xml

@@ -290,9 +290,7 @@
 	<string name="rmd_NoA_snooze">晚点提醒...</string>
 	<string name="rmd_NoA_dlg_title">提醒：</string>
 	<string name="rmd_EPr_quiet_hours_start_title">静音开始时间</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">%s 后提示将静止。\n注意：震动在下面的选项中控制！</string>
 	<string name="rmd_EPr_quiet_hours_end_title">静音时间结束</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">静音时间将在%s后结束</string>
 	<string name="rmd_EPr_rmd_time_title">默认提示</string>
 	<string name="rmd_EPr_rmd_time_desc">未设定截止日期任务的通知会于 %s 出现</string>
 	<string name="rmd_EPr_persistent_title">持续提醒</string>

src/main/res/values-zh-rTW/strings.xml

@@ -328,9 +328,7 @@
 	<string name="rmd_NoA_snooze">晚點提醒...</string>
 	<string name="rmd_NoA_dlg_title">提醒：</string>
 	<string name="rmd_EPr_quiet_hours_start_title">無聲開始時間</string>
-	<string name="rmd_EPr_quiet_hours_start_desc">%s 後提示將靜止。\n注意：震動在下面的選項中控制！</string>
 	<string name="rmd_EPr_quiet_hours_end_title">無聲結束時間</string>
-	<string name="rmd_EPr_quiet_hours_end_desc">通知將在 %s</string>
 	<string name="rmd_EPr_rmd_time_title">默認提示</string>
 	<string name="rmd_EPr_rmd_time_desc">未設定截止日期任務工作的通知會於%s 出現</string>
 	<string name="rmd_EPr_persistent_title">持續通知</string>

src/main/res/values/strings-reminders.xml

@@ -72,13 +72,9 @@
   
   <!-- Reminder Preference: Quiet Hours Start Title -->
   <string name="rmd_EPr_quiet_hours_start_title">Quiet hours start</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the "Vibrate on alert" setting</string>
 
   <!-- Reminder Preference: Quiet Hours End Title -->
   <string name="rmd_EPr_quiet_hours_end_title">Quiet hours end</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Notifications will stop being silent starting at %s</string>
 
   <!-- Reminder Preference: Default Reminder Title -->
   <string name="rmd_EPr_rmd_time_title">Default reminder</string>

src/main/res/values/strings.xml

@@ -87,6 +87,7 @@
     <string name="help_and_feedback">Help &amp; Feedback</string>
     <string name="contact_developer">Contact developer</string>
     <string name="rate_tasks">Rate Tasks</string>
+    <string name="quiet_hours_summary">No sound or vibration during quiet hours</string>
 
     <string-array name="sync_SPr_interval_entries">
         <!-- sync_SPr_interval_entries: Synchronization Intervals -->

src/main/res/xml/preferences_reminders.xml

@@ -34,10 +34,17 @@
         android:dependency="@string/p_rmd_enabled"
         android:key="@string/p_rmd_time"
         android:title="@string/rmd_EPr_rmd_time_title" />
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+        android:defaultValue="false"
+        android:dependency="@string/p_rmd_enabled"
+        android:key="@string/p_rmd_maxvolume"
+        android:summary="@string/rmd_EPr_multiple_maxvolume_desc_true"
+        android:title="@string/rmd_EPr_multiple_maxvolume_title" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:dependency="@string/p_rmd_enabled"
         android:key="@string/p_rmd_enable_quiet"
+        android:summary="@string/quiet_hours_summary"
         android:title="@string/quiet_hours" />
     <org.tasks.ui.TimePreference
         android:defaultValue="@integer/default_quiet_hours_start"
@@ -49,11 +56,5 @@
         android:dependency="@string/p_rmd_enable_quiet"
         android:key="@string/p_rmd_quietEnd"
         android:title="@string/rmd_EPr_quiet_hours_end_title" />
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:defaultValue="false"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_maxvolume"
-        android:summary="@string/rmd_EPr_multiple_maxvolume_desc_true"
-        android:title="@string/rmd_EPr_multiple_maxvolume_title" />
 
 </PreferenceScreen>