From 40b9872566085128ab9aea81f99b8a40dc7dbb29 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 23 Aug 2017 14:05:58 -0500
Subject: [PATCH] Remove vibration pattern preferences

---
 .../astrid/reminders/ReminderPreferences.java |  2 +-
 .../org/tasks/preferences/Preferences.java    | 17 +--------
 app/src/main/res/values-ar/strings.xml        |  3 --
 app/src/main/res/values-bg-rBG/strings.xml    |  3 --
 app/src/main/res/values-cs/strings.xml        |  3 --
 app/src/main/res/values-de/strings.xml        |  3 --
 app/src/main/res/values-es/strings.xml        |  3 --
 app/src/main/res/values-fa/strings.xml        |  3 --
 app/src/main/res/values-fi/strings.xml        |  3 --
 app/src/main/res/values-fr/strings.xml        |  3 --
 app/src/main/res/values-gl/strings.xml        |  3 --
 app/src/main/res/values-hu/strings.xml        |  3 --
 app/src/main/res/values-it/strings.xml        |  3 --
 app/src/main/res/values-iw/strings.xml        |  3 --
 app/src/main/res/values-ja/strings.xml        |  3 --
 app/src/main/res/values-ko/strings.xml        |  3 --
 app/src/main/res/values-nl/strings.xml        |  3 --
 app/src/main/res/values-pl/strings.xml        |  3 --
 app/src/main/res/values-pt-rBR/strings.xml    |  3 --
 app/src/main/res/values-pt/strings.xml        |  1 -
 app/src/main/res/values-ru/strings.xml        |  3 --
 app/src/main/res/values-sr/strings.xml        |  1 -
 app/src/main/res/values-sv/strings.xml        |  3 --
 app/src/main/res/values-tr/strings.xml        |  3 --
 app/src/main/res/values-uk/strings.xml        |  3 --
 app/src/main/res/values/arrays.xml            | 15 --------
 app/src/main/res/values/keys.xml              |  3 --
 app/src/main/res/values/strings.xml           |  3 --
 .../main/res/xml/preferences_reminders.xml    | 38 +++----------------
 29 files changed, 8 insertions(+), 135 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
index b1dd106ca..099be7604 100644
--- a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
+++ b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
@@ -80,7 +80,7 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
 
         requires(R.string.notification_shade, atLeastJellybean(), R.string.p_notification_priority);
         requires(device.supportsLocationServices(), R.string.geolocation_reminders);
-        requires(preOreo(), R.string.p_rmd_ringtone, R.string.p_led_notification);
+        requires(preOreo(), R.string.p_rmd_ringtone, R.string.p_rmd_vibrate, R.string.p_led_notification);
     }
 
     private void rescheduleNotificationsOnChange(int... resIds) {
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java
index 584eeca19..a29445980 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.java
+++ b/app/src/main/java/org/tasks/preferences/Preferences.java
@@ -7,7 +7,6 @@ import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 
-import com.google.common.primitives.Longs;
 import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.SortHelper;
@@ -20,8 +19,6 @@ import org.tasks.themes.ThemeCache;
 import org.tasks.time.DateTime;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.inject.Inject;
@@ -92,7 +89,7 @@ public class Preferences {
     }
 
     public boolean isVibrationEnabled() {
-        return getBoolean(R.string.p_rmd_vibrate, true);
+        return atLeastOreo() || getBoolean(R.string.p_rmd_vibrate, true);
     }
 
     public boolean isLEDNotificationEnabled() {
@@ -415,17 +412,7 @@ public class Preferences {
     }
 
     public long[] getVibrationPattern() {
-        int vibrationCount = getIntegerFromString(R.string.p_vibrate_count, 3);
-        long vibrationDuration = getIntegerFromString(R.string.p_vibrate_duration, 1000);
-        long vibrationPause = getIntegerFromString(R.string.p_vibrate_pause, 500);
-        List<Long> pattern = new ArrayList<>(vibrationCount);
-        pattern.add(0L);
-        pattern.add(vibrationDuration);
-        for (int i = 1 ; i < vibrationCount ; i++) {
-            pattern.add(vibrationPause);
-            pattern.add(vibrationDuration);
-        }
-        return Longs.toArray(pattern);
+        return new long[] {0, 333, 333, 333};
     }
 
     public void remove(int resId) {
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cfa431451..4415ed64d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -180,9 +180,6 @@
 	<string name="high_priority">عال</string>
 	<string name="default_priority">الإفتراضي</string>
 	<string name="low_priority">منخفض</string>
-	<string name="vibration_count">عدد الإهتزازات</string>
-	<string name="vibration_duration">إمتداد الهزة</string>
-	<string name="vibration_pause">التوقف أثناء الهزات</string>
 	<string name="plugin_description">تاسكس هو مشروع مفتوح المصدر مدموع من طرف مطور واحد. بعض الخيارات متوفرة عن الطريق الدفع من داخل التطبيق من أجل دعم التطوير</string>
 	<string name="opacity">التعتيم</string>
 	<string name="master_sync_warning">المزامنة التلقائية معطلة الآن من طرف أندرويد</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 2c9808cc2..e42219446 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -317,9 +317,6 @@
 	<string name="default_priority">По подразбиране</string>
 	<string name="low_priority">Нисък</string>
 	<string name="notification_priority">Приоритет на уведомления</string>
-	<string name="vibration_count">Брой вибрации</string>
-	<string name="vibration_duration">Продължителност на всяка вибрация (милисекунди)</string>
-	<string name="vibration_pause">Пауза между вибрациите (милисекунди)</string>
 	<string name="take_a_picture">Заснемане</string>
 	<string name="pick_from_gallery">Изберете от галерия</string>
 	<string name="pick_from_storage">Изберете от паметта</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ecc203d2f..a1f529368 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -280,9 +280,6 @@
 	<string name="default_priority">Výchozí</string>
 	<string name="low_priority">Nízká</string>
 	<string name="notification_priority">Priorita oznámení</string>
-	<string name="vibration_count">Počet vibrací</string>
-	<string name="vibration_duration">Délka každé vibrace (ms)</string>
-	<string name="vibration_pause">Pauza mezi vibracemi (ms)</string>
 	<string name="privacy">Soukromí</string>
 	<string name="privacy_policy">Zásady ochrany osobních údajů</string>
 	<string name="send_anonymous_statistics">Vylepšit Úkoly</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ce65b485c..dafdd6415 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -310,9 +310,6 @@
 	<string name="default_priority">Standard</string>
 	<string name="low_priority">Niedrig</string>
 	<string name="notification_priority">Benachrichtigungspriorität</string>
-	<string name="vibration_count">Anzahl Vibrationen</string>
-	<string name="vibration_duration">Dauer der Vibration in Millisekunden</string>
-	<string name="vibration_pause">Pause zwischen Vibrationen in Millisekunden</string>
 	<string name="take_a_picture">Bild aufnehmen</string>
 	<string name="pick_from_gallery">Aus Galerie wählen</string>
 	<string name="pick_from_storage">Von Speicher auswählen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7f96e824d..cd71601f5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -313,9 +313,6 @@
 	<string name="default_priority">Por defecto</string>
 	<string name="low_priority">Baja</string>
 	<string name="notification_priority">Prioridad de la notificación</string>
-	<string name="vibration_count">Número de vibraciones</string>
-	<string name="vibration_duration">Duración de cada vibración (milisegundos)</string>
-	<string name="vibration_pause">Pausa entre vibraciones (milisegundos)</string>
 	<string name="take_a_picture">Tomar fotografía</string>
 	<string name="pick_from_gallery">Elegir desde la galería</string>
 	<string name="pick_from_storage">Elegir desde almacenamiento</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 5ebcbd9fe..b59e9c303 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -242,9 +242,6 @@
 	<string name="default_priority">پیش فرض</string>
 	<string name="low_priority">کم</string>
 	<string name="notification_priority">اولویت اعلان</string>
-	<string name="vibration_count">تعداد لرزش ها</string>
-	<string name="vibration_duration">مدت هر لرزش (میلی‌ثانیه)</string>
-	<string name="vibration_pause">مکث بین لرزش‌ها (میلی‌ثانیه)</string>
 	<string name="take_a_picture">گرفتن عکس</string>
 	<string name="send_anonymous_statistics">بهبود وظیفه</string>
 	<string name="tag_already_exists">این تگ قبلاً ایجاد شده است</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index aecc31ce5..a6a3eb72c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -315,9 +315,6 @@
 	<string name="default_priority">Oletuskalenteri</string>
 	<string name="low_priority">Matala</string>
 	<string name="notification_priority">Muistutusten tärkeysjärjestys</string>
-	<string name="vibration_count">Värinän määrä</string>
-	<string name="vibration_duration">Värinän pituus (millisekunteina)</string>
-	<string name="vibration_pause">Tauko värinässä (millisekuntia)</string>
 	<string name="take_a_picture">Ota kuva</string>
 	<string name="pick_from_gallery">Valitse galleriasta</string>
 	<string name="pick_from_storage">Valitse muistista</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e985fc5eb..fc3129832 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -307,9 +307,6 @@
 	<string name="default_priority">Par défaut</string>
 	<string name="low_priority">Basse</string>
 	<string name="notification_priority">Priorité de notification</string>
-	<string name="vibration_count">Nombre de vibrations</string>
-	<string name="vibration_duration">Durée de chaque vibration (millisecondes)</string>
-	<string name="vibration_pause">Pause entre les vibrations (millisecondes)</string>
 	<string name="take_a_picture">Prendre une photo</string>
 	<string name="pick_from_gallery">Choisir depuis la galerie</string>
 	<string name="pick_from_storage">Choisir depuis le stockage</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 92b87826e..fb38dada9 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -314,9 +314,6 @@
 	<string name="default_priority">Por defecto</string>
 	<string name="low_priority">Baixa</string>
 	<string name="notification_priority">Prioridad de la notificación</string>
-	<string name="vibration_count">Número de vibraciones</string>
-	<string name="vibration_duration">Duración de cada vibración (milisegundos)</string>
-	<string name="vibration_pause">Pausa entre vibraciones (milisegundos)</string>
 	<string name="take_a_picture">Tomar fotografía</string>
 	<string name="pick_from_gallery">Elegir desde la galería</string>
 	<string name="pick_from_storage">Elegir desde almacenamiento</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 058b21760..b47e7b019 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -317,9 +317,6 @@
 	<string name="default_priority">Alapértelmezett</string>
 	<string name="low_priority">Alacsony</string>
 	<string name="notification_priority">Értesítés prioritása</string>
-	<string name="vibration_count">Rezgések száma</string>
-	<string name="vibration_duration">Rezgések hossza (ezredmásodpercben)</string>
-	<string name="vibration_pause">Szünet a rezgések között (ezredmásodpercben)</string>
 	<string name="take_a_picture">Kép készítése</string>
 	<string name="pick_from_gallery">Kiválasztás a galériából</string>
 	<string name="pick_from_storage">Kiválasztás a tárhelyről</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index eb8edca93..6434029bb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -313,9 +313,6 @@
 	<string name="high_priority">Alta</string>
 	<string name="low_priority">Bassa</string>
 	<string name="notification_priority">Priorità avvisi</string>
-	<string name="vibration_count">Numero di vibrazioni</string>
-	<string name="vibration_duration">Durata di ogni vibrazione (millisecondi)</string>
-	<string name="vibration_pause">Durata intervallo vibrazioni (millisecondi)</string>
 	<string name="take_a_picture">Scatta un foto</string>
 	<string name="pick_from_gallery">Scegli dalla libreria</string>
 	<string name="pick_from_storage">Scegli dalla memoria</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index a9d526bbb..f9092edb1 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -315,9 +315,6 @@
 	<string name="default_priority">ברירת מחדל</string>
 	<string name="low_priority">נמוך</string>
 	<string name="notification_priority">חשיבות ההתראה</string>
-	<string name="vibration_count">מספר פעימות הרטט</string>
-	<string name="vibration_duration">אורך כל פעימת רטט (במילישניות)</string>
-	<string name="vibration_pause">אורך הפסקה בין פעימות רטט (במילישניות)</string>
 	<string name="take_a_picture">צלם תמונה</string>
 	<string name="pick_from_gallery">בחירה מהגלריה</string>
 	<string name="pick_from_storage">בחירה מאחסון</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 347c3624e..a0bff4c9f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -315,9 +315,6 @@
 	<string name="default_priority">デフォルト</string>
 	<string name="low_priority">低</string>
 	<string name="notification_priority">通知優先度</string>
-	<string name="vibration_count">振動の数</string>
-	<string name="vibration_duration">それぞれの振動の長さ (ミリ秒)</string>
-	<string name="vibration_pause">振動の間のポーズ (ミリ秒)</string>
 	<string name="take_a_picture">写真を撮影</string>
 	<string name="pick_from_gallery">ギャラリーから選択</string>
 	<string name="pick_from_storage">ストレージから選択</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 1d1e5c3c1..a839d4a67 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -319,9 +319,6 @@
 	<string name="default_priority">기본값</string>
 	<string name="low_priority">낮음</string>
 	<string name="notification_priority">알림 우선순위</string>
-	<string name="vibration_count">진동 횟수</string>
-	<string name="vibration_duration">진동 길이 (밀리초)</string>
-	<string name="vibration_pause">진동 사이의 간격 (밀리초)</string>
 	<string name="take_a_picture">사진 촬영</string>
 	<string name="pick_from_gallery">갤러리에서 선택</string>
 	<string name="pick_from_storage">저장소에서 가져오기</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5b739ad9a..9632e6be9 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -310,9 +310,6 @@
 	<string name="default_priority">Standaard</string>
 	<string name="low_priority">Laag</string>
 	<string name="notification_priority">Notificatie prioriteit</string>
-	<string name="vibration_count">Aantal trillingen</string>
-	<string name="vibration_duration">Lengte van elke trilling (miliseconden)</string>
-	<string name="vibration_pause">Pauze tussen trillingen (miliseconden)</string>
 	<string name="take_a_picture">Maak een foto</string>
 	<string name="pick_from_gallery">Kies uit de gallerij</string>
 	<string name="pick_from_storage">Kies van opslag</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8a33f0dc9..44f783ca6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -314,9 +314,6 @@
 	<string name="default_priority">Domyślne</string>
 	<string name="low_priority">Mało ważne</string>
 	<string name="notification_priority">Priorytet powiadomienia</string>
-	<string name="vibration_count">Powtórzenia wibracji</string>
-	<string name="vibration_duration">Długość wibracji (milisekundy)</string>
-	<string name="vibration_pause">Przerwa pomiędzy wibracjami (milisekundy)</string>
 	<string name="take_a_picture">Wybierz obrazek</string>
 	<string name="pick_from_gallery">Wybierz z galerii</string>
 	<string name="pick_from_storage">Wybierz z pamięci</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c7f6959dd..aab9e0698 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -308,9 +308,6 @@
 	<string name="default_priority">Padrão</string>
 	<string name="low_priority">Baixa</string>
 	<string name="notification_priority">Prioridade da Notificação</string>
-	<string name="vibration_count">Número de vibrações</string>
-	<string name="vibration_duration">Duração de cada vibração (milissegundos)</string>
-	<string name="vibration_pause">Pausa entre vibrações (milissegundos)</string>
 	<string name="take_a_picture">Tirar uma foto</string>
 	<string name="pick_from_gallery">Selecionar da galeria</string>
 	<string name="privacy">Privacidade</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d517b1ead..6879e39e7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -281,7 +281,6 @@
 	<string name="reverse">Reverter</string>
 	<string name="get_plugins">Compras na aplicação</string>
 	<string name="add_attachment">Adicionar anexo</string>
-	<string name="vibration_count">Número de vibrações</string>
 	<string name="privacy">Privacidade</string>
 	<string name="privacy_policy">Política de privacidade</string>
 	<string name="default_list">Lista padrão</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 763e96526..ca81683f8 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -314,9 +314,6 @@
 	<string name="default_priority">По умолчанию</string>
 	<string name="low_priority">Низкий</string>
 	<string name="notification_priority">Приоритет уведомлений</string>
-	<string name="vibration_count">Количество вибраций</string>
-	<string name="vibration_duration">Продолжительность каждой вибрации (миллисекунды)</string>
-	<string name="vibration_pause">Пауза между вибрациями (миллисекунды)</string>
 	<string name="take_a_picture">Выбрать изображение</string>
 	<string name="pick_from_gallery">Выбрать из галереи</string>
 	<string name="pick_from_storage">Выбрать с диска</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 52bf10ca8..0dfc173bd 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -39,7 +39,6 @@
 	<string name="high_priority">Visok</string>
 	<string name="default_priority">Podrazumevano</string>
 	<string name="low_priority">Nisak</string>
-	<string name="vibration_count">Broj vibracija</string>
 	<string name="layout_direction">Raspored komandi</string>
 	<string name="layout_direction_left_to_right">Sleva nadesno</string>
 	<string name="layout_direction_right_to_left">Zdesna nalevo</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index ebc885e97..269c7b53d 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -311,9 +311,6 @@
 	<string name="default_priority">Standard</string>
 	<string name="low_priority">Låg</string>
 	<string name="notification_priority">Prioritering för påminnelser</string>
-	<string name="vibration_count">Antal vibrationer</string>
-	<string name="vibration_duration">Längd på varje vibration (millisekunder)</string>
-	<string name="vibration_pause">Paus mellan varje vibration (millisekunder)</string>
 	<string name="take_a_picture">Ta en bild</string>
 	<string name="pick_from_gallery">Välj från album</string>
 	<string name="pick_from_storage">Välj från lagring</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 61e941599..ad9735c03 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -233,9 +233,6 @@
 	<string name="high_priority">Yüksek</string>
 	<string name="default_priority">Varsayılan</string>
 	<string name="low_priority">Düşük</string>
-	<string name="vibration_count">Titreşim sayısı</string>
-	<string name="vibration_duration">Her titreşimin uzunluğu (milisaniye)</string>
-	<string name="vibration_pause">Titreşimler arasında duraklama (milisaniye)</string>
 	<string name="privacy">Gizlilik</string>
 	<string name="privacy_policy">Gizlilik politikası</string>
 	<string name="send_anonymous_statistics">Task\'ı İyileştir</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d0685aa18..0a7ca4358 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -316,9 +316,6 @@
 	<string name="default_priority">За замовчуванням</string>
 	<string name="low_priority">Низький</string>
 	<string name="notification_priority">Пріоритет сповіщення</string>
-	<string name="vibration_count">Кількість вібрацій</string>
-	<string name="vibration_duration">Довжина кожної вібрації (мілісекунди)</string>
-	<string name="vibration_pause">Пауза між вібраціями (мілісекунди)</string>
 	<string name="take_a_picture">Зробити фото</string>
 	<string name="pick_from_gallery">Обрати з галереї</string>
 	<string name="pick_from_storage">Обрати зі сховища</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 7ec2ba1cc..5559b302a 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="vibration_count">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-    </string-array>
-
-    <string-array name="vibration_duration">
-        <item>250</item>
-        <item>500</item>
-        <item>750</item>
-        <item>1000</item>
-    </string-array>
-
     <string-array name="geofence_radius_values">
         <item>75</item>
         <item>125</item>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 2a9c4c3f6..c096429e3 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -41,9 +41,6 @@
   
   <!-- whether to vibrate phone when reminder fires -->
   <string name="p_rmd_vibrate">notif_vibrate</string>
-  <string name="p_vibrate_count">vibrate_count</string>
-  <string name="p_vibrate_duration">vibrate_duration</string>
-  <string name="p_vibrate_pause">vibrate_pause</string>
 
   <!-- ringtone to use for notifications -->
   <string name="p_rmd_ringtone">notification_ringtone</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3e061cb0..9c9c32788 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -709,9 +709,6 @@ File %1$s contained %2$s.\n\n
     <string name="default_priority">Default</string>
     <string name="low_priority">Low</string>
     <string name="notification_priority">Notification priority</string>
-    <string name="vibration_count">Number of vibrations</string>
-    <string name="vibration_duration">Length of each vibration (milliseconds)</string>
-    <string name="vibration_pause">Pause between vibrations (milliseconds)</string>
     <string name="take_a_picture">Take a picture</string>
     <string name="pick_from_gallery">Pick from gallery</string>
     <string name="pick_from_storage">Pick from storage</string>
diff --git a/app/src/main/res/xml/preferences_reminders.xml b/app/src/main/res/xml/preferences_reminders.xml
index a8a2b90a5..f0ab6295c 100644
--- a/app/src/main/res/xml/preferences_reminders.xml
+++ b/app/src/main/res/xml/preferences_reminders.xml
@@ -20,6 +20,11 @@
         android:showDefault="true"
         android:showSilent="true"
         android:title="@string/sound" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:dependency="@string/p_rmd_enabled"
+        android:key="@string/p_rmd_vibrate"
+        android:title="@string/vibrations" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:dependency="@string/p_rmd_enabled"
@@ -63,39 +68,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/vibrations">
-
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:dependency="@string/p_rmd_enabled"
-            android:key="@string/p_rmd_vibrate"
-            android:title="@string/enabled" />
-
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:defaultValue="3"
-            android:dependency="@string/p_rmd_vibrate"
-            android:entries="@array/vibration_count"
-            android:entryValues="@array/vibration_count"
-            android:key="@string/p_vibrate_count"
-            android:title="@string/vibration_count" />
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:defaultValue="1000"
-            android:dependency="@string/p_rmd_vibrate"
-            android:entries="@array/vibration_duration"
-            android:entryValues="@array/vibration_duration"
-            android:key="@string/p_vibrate_duration"
-            android:title="@string/vibration_duration" />
-        <com.todoroo.astrid.ui.MultilineListPreference
-            android:defaultValue="500"
-            android:dependency="@string/p_rmd_vibrate"
-            android:entries="@array/vibration_duration"
-            android:entryValues="@array/vibration_duration"
-            android:key="@string/p_vibrate_pause"
-            android:title="@string/vibration_pause" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="@string/geolocation_reminders"
         android:title="@string/geolocation_reminders">