archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove vibration pattern preferences

Browse Source
pull/574/head
Alex Baker 7 years ago
parent 62e37459bc
commit 40b9872566
29 changed files with 8 additions and 135 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
Unescape Escape View File

@ -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) {

17
app/src/main/java/org/tasks/preferences/Preferences.java
Unescape Escape View File

@ -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) {

3
app/src/main/res/values-ar/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-bg-rBG/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-cs/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-de/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-es/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-fa/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-fi/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-gl/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-hu/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-it/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-iw/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-ja/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-ko/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-nl/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-pl/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -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>

1
app/src/main/res/values-pt/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-ru/strings.xml
Unescape Escape View File

@ -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>

1
app/src/main/res/values-sr/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-sv/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-tr/strings.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values-uk/strings.xml
Unescape Escape View File

@ -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>

15
app/src/main/res/values/arrays.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -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>

3
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -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>

38
app/src/main/res/xml/preferences_reminders.xml
Unescape Escape View File

@ -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">

Write Preview
Loading…
Cancel
Save