From 805caeb434ac2894fdfdf80d9d74d2afb3f4e3bf Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 24 Aug 2017 12:21:36 -0500
Subject: [PATCH] Remove max volume preference

---
 app/src/main/java/org/tasks/Notifier.java     | 30 ++-----------------
 .../org/tasks/notifications/AudioManager.java | 17 -----------
 app/src/main/res/values-bg-rBG/strings.xml    |  2 --
 app/src/main/res/values-cs/strings.xml        |  1 -
 app/src/main/res/values-de/strings.xml        |  2 --
 app/src/main/res/values-el/strings.xml        |  1 -
 app/src/main/res/values-es/strings.xml        |  2 --
 app/src/main/res/values-fi/strings.xml        |  2 --
 app/src/main/res/values-fr/strings.xml        |  2 --
 app/src/main/res/values-gl/strings.xml        |  2 --
 app/src/main/res/values-hu/strings.xml        |  2 --
 app/src/main/res/values-it/strings.xml        |  2 --
 app/src/main/res/values-iw/strings.xml        |  2 --
 app/src/main/res/values-ja/strings.xml        |  2 --
 app/src/main/res/values-ko/strings.xml        |  2 --
 app/src/main/res/values-nl/strings.xml        |  2 --
 app/src/main/res/values-pl/strings.xml        |  2 --
 app/src/main/res/values-pt-rBR/strings.xml    |  2 --
 app/src/main/res/values-pt/strings.xml        |  2 --
 app/src/main/res/values-ru/strings.xml        |  2 --
 app/src/main/res/values-sk/strings.xml        |  2 --
 app/src/main/res/values-sl-rSI/strings.xml    |  2 --
 app/src/main/res/values-sv/strings.xml        |  2 --
 app/src/main/res/values-tr/strings.xml        |  2 --
 app/src/main/res/values-uk/strings.xml        |  2 --
 app/src/main/res/values-zh-rCN/strings.xml    |  2 --
 app/src/main/res/values-zh-rTW/strings.xml    |  2 --
 app/src/main/res/values/keys.xml              |  3 --
 app/src/main/res/values/strings.xml           |  5 ----
 .../main/res/xml/preferences_reminders.xml    |  6 ----
 30 files changed, 2 insertions(+), 107 deletions(-)

diff --git a/app/src/main/java/org/tasks/Notifier.java b/app/src/main/java/org/tasks/Notifier.java
index e092622b7..7ebfe07e8 100644
--- a/app/src/main/java/org/tasks/Notifier.java
+++ b/app/src/main/java/org/tasks/Notifier.java
@@ -288,17 +288,8 @@ public class Notifier {
 
         boolean voiceReminder = preferences.getBoolean(R.string.p_voiceRemindersEnabled, false) && !isNullOrEmpty(text);
 
-        // if multi-ring is activated and the setting p_rmd_maxvolume allows it, set up the flags for insistent
-        // notification, and increase the volume to full volume, so the user
-        // will actually pay attention to the alarm
-        boolean maxOutVolumeForMultipleRingReminders = preferences.getBoolean(R.string.p_rmd_maxvolume, true);
-        // remember it to set it to the old value after the alarm
-        int previousAlarmVolume = audioManager.getAlarmVolume();
         if (ringTimes != 1) {
             notification.audioStreamType = android.media.AudioManager.STREAM_ALARM;
-            if (maxOutVolumeForMultipleRingReminders) {
-                audioManager.setMaxAlarmVolume();
-            }
 
             // insistent rings until notification is disabled
             if (ringTimes < 0) {
@@ -338,26 +329,9 @@ public class Notifier {
             notificationManager.notify(notificationId, notification);
             AndroidUtilities.sleepDeep(500);
         }
-        if (voiceReminder || maxOutVolumeForMultipleRingReminders) {
+        if (voiceReminder) {
             AndroidUtilities.sleepDeep(2000);
-            for (int i = 0; i < 50; i++) {
-                AndroidUtilities.sleepDeep(500);
-                if (!audioManager.isRingtoneMode()) {
-                    break;
-                }
-            }
-            try {
-                // first reset the Alarm-volume to the value before it was eventually maxed out
-                if (maxOutVolumeForMultipleRingReminders) {
-                    audioManager.setAlarmVolume(previousAlarmVolume);
-                }
-                if (voiceReminder) {
-                    voiceOutputAssistant.speak(text);
-                }
-            } catch (VerifyError e) {
-                // unavailable
-                Timber.e(e, e.getMessage());
-            }
+            voiceOutputAssistant.speak(text);
         }
     }
 
diff --git a/app/src/main/java/org/tasks/notifications/AudioManager.java b/app/src/main/java/org/tasks/notifications/AudioManager.java
index a8f2d5bbe..ae3228a6a 100644
--- a/app/src/main/java/org/tasks/notifications/AudioManager.java
+++ b/app/src/main/java/org/tasks/notifications/AudioManager.java
@@ -15,24 +15,7 @@ public class AudioManager {
         audioManager = (android.media.AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
 
-    public int getAlarmVolume() {
-        return audioManager.getStreamVolume(android.media.AudioManager.STREAM_ALARM);
-    }
-
-    public void setMaxAlarmVolume() {
-        audioManager.setStreamVolume(android.media.AudioManager.STREAM_ALARM,
-                audioManager.getStreamMaxVolume(android.media.AudioManager.STREAM_ALARM), 0);
-    }
-
     public boolean notificationsMuted() {
         return audioManager.getStreamVolume(android.media.AudioManager.STREAM_NOTIFICATION) == 0;
     }
-
-    public boolean isRingtoneMode() {
-        return audioManager.getMode() == android.media.AudioManager.MODE_RINGTONE;
-    }
-
-    public void setAlarmVolume(int volume) {
-        audioManager.setStreamVolume(android.media.AudioManager.STREAM_ALARM, volume, 0);
-    }
 }
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 3bfa46efd..5978b6e93 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -190,8 +190,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Уведомления за задачи без крайни срокове ще се показват на %s</string>
 	<string name="persistent_notifications">Постоянни уведомления</string>
 	<string name="persistent_notifications_description">Постоянни уведомления не могат да бъдат изчиствани</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Максимизирай нивото на звука при няколкократни напомняния</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks ще максимизира нивото на звука при няколкократни напомняния</string>
 	<string name="rmd_EPr_defaultRemind_title">Случайни напомняния</string>
 	<string name="default_random_reminder_disabled">изключено</string>
 	<string name="default_random_reminder_hourly">всеки час</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 01cb4bc00..7557c7c41 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -174,7 +174,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">Nerušit do</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_multiple_maxvolume_title">Nejvyšší hlasitost pro opakované zvonění upomínky</string>
 	<string name="rmd_EPr_defaultRemind_title">Náhodná upozornění</string>
 	<string name="default_random_reminder_disabled">zakázáno</string>
 	<string name="default_random_reminder_hourly">každou hodinu</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 40e1809b0..a1a3bd763 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -184,8 +184,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Benachrichtigungen für Aufgaben ohne Fälligkeit werden um %s angezeigt</string>
 	<string name="persistent_notifications">Hartnäckige Benachrichtigungen</string>
 	<string name="persistent_notifications_description">Hartnäckige Benachrichtigungen können nicht einfach gelöscht werden</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Maximale Lautstärke für mehrfachläutende Erinnerungen</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks wird die Lautstärke für mehrfachläutende Erinnerungen maximieren</string>
 	<string name="rmd_EPr_defaultRemind_title">Zufällige Erinnerungen</string>
 	<string name="default_random_reminder_disabled">deaktiviert</string>
 	<string name="default_random_reminder_hourly">stündlich</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index cc04a46c7..f4eb2f560 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -154,7 +154,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">Τέλος ώρας κοινής ησυχίας</string>
 	<string name="rmd_EPr_rmd_time_title">Προκαθορισμένη υπενθύμιση</string>
 	<string name="rmd_EPr_rmd_time_desc">Ειδοποιήσεις για εργασίες χωρίς ώρα λήξης θα φαίνονται στις %s</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Μέγιστος ήχος για πολλαπλούς ήχους υπενθυμίσεων</string>
 	<string name="rmd_EPr_defaultRemind_title">Τυχαίες υπενθυμίσεις</string>
 	<string name="default_random_reminder_disabled">απενεργοποιημένο</string>
 	<string name="default_random_reminder_hourly">ωριαία</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ab9c6bc32..59693efd5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -186,8 +186,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Las notificaciones de tareas sin vencimiento aparecerán a las %s</string>
 	<string name="persistent_notifications">Notificaciones persistentes</string>
 	<string name="persistent_notifications_description">Las notificaciones persistentes no se pueden borrar</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Máximo volumen para recordatorios con tonos múltiples</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks fijará el volumen máximo para avisos con tonos múltiples</string>
 	<string name="rmd_EPr_defaultRemind_title">Recordatorios aleatorios</string>
 	<string name="default_random_reminder_disabled">deshabilitado</string>
 	<string name="default_random_reminder_hourly">cada hora</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 7fccdabe3..633d862dc 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -191,8 +191,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Ilman määräaikaa olevien tehtävien ilmoitukset näkyvät %s</string>
 	<string name="persistent_notifications">Jatkuvat ilmoitukset</string>
 	<string name="persistent_notifications_description">Jatkuvia ilmoituksia ei voi tyhjentää</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Täysi voimakkuus usean soittoäänen ilmoituksille</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks asettaa täyden voimakkuuden usean soittoäänen ilmoituksille</string>
 	<string name="rmd_EPr_defaultRemind_title">Satunnainen muistutus</string>
 	<string name="default_random_reminder_disabled">Estetty</string>
 	<string name="default_random_reminder_hourly">Tunneittain</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 31502aead..a562a572c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -184,8 +184,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Les notifications pour les tâches sans échéances apparaîtront à %s</string>
 	<string name="persistent_notifications">Notifications persistantes</string>
 	<string name="persistent_notifications_description">Les notifications persistantes ne peuvent pas être supprimées</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Volume maximum pour les rappels multi sonneries</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks va maximiser le volume de multiples sonneries de rappels</string>
 	<string name="rmd_EPr_defaultRemind_title">Rappels aléatoires</string>
 	<string name="default_random_reminder_disabled">désactivé</string>
 	<string name="default_random_reminder_hourly">chaque heure</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index e7d81a7a6..cad9449e5 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -187,8 +187,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Las notificaciones de tareas sin vencimiento aparecerán a las %s</string>
 	<string name="persistent_notifications">Notificaciones persistentes</string>
 	<string name="persistent_notifications_description">Las notificaciones persistentes no se pueden borrar</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Máximo volumen para recordatorios con tonos múltiples</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks fijará el volumen máximo para avisos con tonos múltiples</string>
 	<string name="rmd_EPr_defaultRemind_title">Recordatorios aleatorios</string>
 	<string name="default_random_reminder_disabled">deshabilitado</string>
 	<string name="default_random_reminder_hourly">cada hora</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 7170ffccd..89894d1b6 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -190,8 +190,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Esedékességi idő nélküli feladatok értesítése %s-kor jelenik meg</string>
 	<string name="persistent_notifications">Állandó értesítések</string>
 	<string name="persistent_notifications_description">Az állandó értesítések nem törölhetőek</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Többszörös csengésű emlékeztetők hangerejének maximalizálása</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">A Tasks maximalizálja a többszörös csengésű emlékeztetők hangerejét</string>
 	<string name="rmd_EPr_defaultRemind_title">Véletlenszerű emlékeztetők</string>
 	<string name="default_random_reminder_disabled">Letiltva</string>
 	<string name="default_random_reminder_hourly">Óránként</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c9227dea6..f3325acb6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -188,8 +188,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Le notifiche per le attività senza scadenza appariranno alle %s</string>
 	<string name="persistent_notifications">Notifiche persistenti</string>
 	<string name="persistent_notifications_description">Le notifiche persistenti non possono essere cancellate</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Volume massimo per promemoria \"ring-multipli\"</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks metterà il volume al massimo per i promemoria \"ring-multipli\"</string>
 	<string name="rmd_EPr_defaultRemind_title">Promemoria Casuali</string>
 	<string name="default_random_reminder_disabled">disabilitato</string>
 	<string name="default_random_reminder_hourly">ogni ora</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index ae8968da2..3dc8aa1ad 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -188,8 +188,6 @@
 	<string name="rmd_EPr_rmd_time_desc">התראות משימות ללא מועד יעד תגענה ב-%s</string>
 	<string name="persistent_notifications">הודעות תמידיות</string>
 	<string name="persistent_notifications_description">הודעות תמידיות לא יכולות להימחק ע\"י החלקה</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">עוצמת קול מירבית לתזכורות מרובות צילצולים</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">אסטריד תשתמש בעוצמת קול מירבית לתזכורות רבות צלצולים</string>
 	<string name="rmd_EPr_defaultRemind_title">תזכורות אקראיות</string>
 	<string name="default_random_reminder_disabled">לא זמין</string>
 	<string name="default_random_reminder_hourly">שעתי</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6cf0b5f9a..d0cb84fa6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -188,8 +188,6 @@
 	<string name="rmd_EPr_rmd_time_desc">期限の時間がないタスクの通知は %s に表示されます</string>
 	<string name="persistent_notifications">永続的な通知</string>
 	<string name="persistent_notifications_description">永続的な通知はクリアできません</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">複数の通知音の最大音量</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks は複数の通知音の最大音量です</string>
 	<string name="rmd_EPr_defaultRemind_title">ランダムな通知</string>
 	<string name="default_random_reminder_disabled">無効</string>
 	<string name="default_random_reminder_hourly">1時間毎</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9d54eef78..477b44ece 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -192,8 +192,6 @@
 	<string name="rmd_EPr_rmd_time_desc">마감일이 없는 할일 알림은 %s 에 나타날 것입니다.</string>
 	<string name="persistent_notifications">항구적 알림</string>
 	<string name="persistent_notifications_description">항구적 알림은 지울 수 없습니다</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">다중-링 알림의 최대 볼륨</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks는 다중 소리 알림을 최대 볼륨으로 출력합니다</string>
 	<string name="rmd_EPr_defaultRemind_title">무작위 알림</string>
 	<string name="default_random_reminder_disabled">사용안함</string>
 	<string name="default_random_reminder_hourly">매시간</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 992ea8cf2..70210b0aa 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -187,8 +187,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Waarschuwingen voor taken zonder eindtijd verschijnen om %s</string>
 	<string name="persistent_notifications">Aanhoudende notificaties</string>
 	<string name="persistent_notifications_description">Aanhoudende notificaties kunnen niet worden gewist</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Max. volume voor multiple-ring herinneringen</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks zal het volume voor multi-ring herinneringen maximaliseren</string>
 	<string name="rmd_EPr_defaultRemind_title">Willekeurige herinneringen</string>
 	<string name="default_random_reminder_disabled">uitgeschakeld</string>
 	<string name="default_random_reminder_hourly">uurlijks</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index febd56ad9..a33272dc9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -187,8 +187,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Powiadomienia zadań bez odpowiedniego czasu pojawi się na %s</string>
 	<string name="persistent_notifications">Natarczywe powiadomienia</string>
 	<string name="persistent_notifications_description">Natarczywe powiadomienia nie mogą zostać wyczyszczone</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Maksymalna głośność dla wielu dzwonków przypomnień</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks ustawi maksymalną głośność dla wielu dzwonków przypomnień</string>
 	<string name="rmd_EPr_defaultRemind_title">Losowe przypomnienia</string>
 	<string name="default_random_reminder_disabled">wyłączone</string>
 	<string name="default_random_reminder_hourly">co godzinę</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 085ecfd50..0781c7280 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -184,8 +184,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Notificações de tarefas sem tempo de vencimento vão aparecer em %s</string>
 	<string name="persistent_notifications">Notificações persistentes</string>
 	<string name="persistent_notifications_description">Notificações persistentes não podem ser removidas</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Volume máximo para lembretes com múltiplos sons</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks irá aumentar o volume para alertas com múltiplos sons</string>
 	<string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
 	<string name="default_random_reminder_disabled">desabilitado</string>
 	<string name="default_random_reminder_hourly">de hora em hora</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 6879e39e7..e543c7867 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -171,8 +171,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">Fim das horas de silêncio</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_multiple_maxvolume_title">Volume máximo para lembretes com vários toques</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">O Tasks irá amplificar o volume para lembretes com vários toques</string>
 	<string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
 	<string name="default_random_reminder_disabled">desativado</string>
 	<string name="default_random_reminder_hourly">horário</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6f63959c6..79463690d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -187,8 +187,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Уведомления для задач без срока выполнения появятся в %s</string>
 	<string name="persistent_notifications">Постоянные напоминания</string>
 	<string name="persistent_notifications_description">Постоянные напоминания не могут быть удалены</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Максимальная громкость для многоразовых напоминаний</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks будет увеличивать громкость для многоразовых напоминаний</string>
 	<string name="rmd_EPr_defaultRemind_title">Случайные напоминания</string>
 	<string name="default_random_reminder_disabled">отключено</string>
 	<string name="default_random_reminder_hourly">ежечасно</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index faee355d7..53c7479a5 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -166,8 +166,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">Tiché hodiny skončili</string>
 	<string name="rmd_EPr_rmd_time_title">Predvolená pripomienka</string>
 	<string name="rmd_EPr_rmd_time_desc">Oznámenia úloh bez času dokončenia sa objavia %s</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Max. hlasitosť pre viacnásobné zvonenie pripomienky</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks bude zvoniť max. hlasitosťou pre viacnásobné pripomienky</string>
 	<string name="rmd_EPr_defaultRemind_title">Náhodné pripomienky</string>
 	<string name="default_random_reminder_disabled">zablokovaný</string>
 	<string name="default_random_reminder_hourly">každú hodinu</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index acdf5af42..e03e0380f 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -158,8 +158,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">Tihe ure se končajo ob</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_multiple_maxvolume_title">Največja jakost zvoka opomnikov z večkratnim zvonenjem</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Aplikacija Opravki bo izvajala opomnike z večkratnim zvonenjem pri polni jakosti zvoka.</string>
 	<string name="rmd_EPr_defaultRemind_title">Naključni opomniki</string>
 	<string name="default_random_reminder_disabled">onemogočen</string>
 	<string name="default_random_reminder_hourly">vsako uro</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 9738599f6..855b17156 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -188,8 +188,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Påminnelser för uppgifter utan sluttid visas %s</string>
 	<string name="persistent_notifications">Upprepade påminnelser</string>
 	<string name="persistent_notifications_description">Upprepade påminnelser kan inte döljas</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Maxvolym för flera ringande påminnelser</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks sätter volymen på max för flera ringande påminnelser</string>
 	<string name="rmd_EPr_defaultRemind_title">Tillfälliga påminnelser</string>
 	<string name="default_random_reminder_disabled">inaktiverad</string>
 	<string name="default_random_reminder_hourly">varje timme</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5b91d40d7..c0b9889fb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -149,8 +149,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">Sessiz saatlerin sonu</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_multiple_maxvolume_title">Çoklu çalan hatırlatmalar için en yüksek ses seviyesi</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Çoklu çalan hatırlatmalar için Tasks ses seviyesini en yükseğe çıkaracaktır</string>
 	<string name="rmd_EPr_defaultRemind_title">Rastgele Hatırlatmalar</string>
 	<string name="default_random_reminder_disabled">devre dışı</string>
 	<string name="default_random_reminder_hourly">saat başı</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7e7532dbd..34c38289c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -190,8 +190,6 @@
 	<string name="rmd_EPr_rmd_time_desc">Сповіщення для задач без терміну виконання з\'являться о %s</string>
 	<string name="persistent_notifications">Стійкі сповіщення</string>
 	<string name="persistent_notifications_description">Стійкі сповіщення не можуть бути відхилені</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">Максимальна гучність для багаторазових нагадувань</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks буде максимізувати гучність для багаторазових нагадувань</string>
 	<string name="rmd_EPr_defaultRemind_title">Випадкові нагадування</string>
 	<string name="default_random_reminder_disabled">вимкнено</string>
 	<string name="default_random_reminder_hourly">щогодинно</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b3707a0a5..592442059 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -144,8 +144,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">静音时间结束</string>
 	<string name="rmd_EPr_rmd_time_title">默认提示</string>
 	<string name="rmd_EPr_rmd_time_desc">未设定截止日期任务的通知会于 %s 出现</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">清单小助理将会以最大音量进行多重提醒</string>
 	<string name="rmd_EPr_defaultRemind_title">随机提醒</string>
 	<string name="default_random_reminder_disabled">停用</string>
 	<string name="default_random_reminder_hourly">每小时</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8c3727862..6fa245045 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -153,8 +153,6 @@
 	<string name="rmd_EPr_quiet_hours_end_title">無聲結束時間</string>
 	<string name="rmd_EPr_rmd_time_title">預設提醒</string>
 	<string name="rmd_EPr_rmd_time_desc">未設定截止日期任務工作的通知會於%s 出現</string>
-	<string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
-	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks將會以最大音量進行多重提醒</string>
 	<string name="rmd_EPr_defaultRemind_title">隨機提醒</string>
 	<string name="default_random_reminder_disabled">停用</string>
 	<string name="default_random_reminder_hourly">每小時</string>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index dac89703f..d29d7cd99 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -36,9 +36,6 @@
   <!-- whether "clear all notifications" clears astrid notifications -->
   <string name="p_rmd_persistent">notif_annoy</string>
   
-  <!-- whether to max out the notification reminder volume if reminder has setting "ring multiple" or "ring continuous" -->
-  <string name="p_rmd_maxvolume">notif_maxvol</string>
-  
   <!-- whether to vibrate phone when reminder fires -->
   <string name="p_rmd_vibrate">notif_vibrate</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4aebd9e32..b39509908 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -497,11 +497,6 @@ File %1$s contained %2$s.\n\n
     <!-- Reminder Preference: Notification Persistence Description (true) -->
     <string name="persistent_notifications_description">Persistent notifications cannot be cleared</string>
 
-    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-    <string name="rmd_EPr_multiple_maxvolume_title">Max volume for multiple-ring reminders</string>
-    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-    <string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks will max out the volume for multiple-ring reminders</string>
-
     <!-- slide 44g: Reminder Preference: Default Reminders Title -->
     <string name="rmd_EPr_defaultRemind_title">Random reminders</string>
 
diff --git a/app/src/main/res/xml/preferences_reminders.xml b/app/src/main/res/xml/preferences_reminders.xml
index c4a856a9e..32e502c50 100644
--- a/app/src/main/res/xml/preferences_reminders.xml
+++ b/app/src/main/res/xml/preferences_reminders.xml
@@ -52,12 +52,6 @@
         android:key="@string/p_rmd_time"
         android:title="@string/rmd_EPr_rmd_time_title"
         tasks:summary="@string/rmd_EPr_rmd_time_desc" />
-    <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" />
 
     <PreferenceCategory
         android:key="@string/geolocation_reminders"