Restore option to disable notifications

pull/253/head
Alex Baker 11 years ago
parent 12aa141b84
commit f9e9b7cd7e

@ -450,10 +450,7 @@
<activity
android:name="com.todoroo.astrid.reminders.ReminderPreferences"
android:theme="@android:style/Theme"
android:label="@string/rmd_EPr_alerts_header">
<meta-data
android:name="summary"
android:resource="@string/rmd_EPr_alerts_summary" />
android:label="@string/notifications">
<intent-filter>
<action android:name="org.tasks.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />

@ -3,7 +3,9 @@ package org.tasks.notifications;
import android.app.Notification;
import android.content.Context;
import org.tasks.R;
import org.tasks.injection.ForApplication;
import org.tasks.preferences.Preferences;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -12,9 +14,11 @@ import javax.inject.Singleton;
public class NotificationManager {
private final android.app.NotificationManager notificationManager;
private final Preferences preferences;
@Inject
public NotificationManager(@ForApplication Context context) {
public NotificationManager(@ForApplication Context context, Preferences preferences) {
this.preferences = preferences;
notificationManager = (android.app.NotificationManager)
context.getSystemService(Context.NOTIFICATION_SERVICE);
}
@ -24,6 +28,8 @@ public class NotificationManager {
}
public void notify(int notificationId, Notification notification) {
notificationManager.notify(notificationId, notification);
if (preferences.getBoolean(R.string.p_rmd_enabled, true)) {
notificationManager.notify(notificationId, notification);
}
}
}

@ -63,8 +63,6 @@
<string name="rmd_NoA_filter">تذكير!</string>
<string name="rmd_NoA_done">اكمل</string>
<string name="rmd_NoA_snooze">غفوة</string>
<string name="rmd_EPr_alerts_header">إعدادات التذكير</string>
<string name="rmd_EPr_alerts_summary">الساعات الهادئة، وخيارات الغفوة، ومستوى الثبات</string>
<string name="rmd_EPr_ringtone_desc_default">سيتم استخدام النغمة المفضلة</string>
<string-array name="repeat_until_shortcuts">
<item>Forever</item>

@ -379,8 +379,6 @@
<string name="rmd_NoA_done">Завършен</string>
<string name="rmd_NoA_snooze">Отложи</string>
<string name="rmd_NoA_dlg_title">Напомняне:</string>
<string name="rmd_EPr_alerts_header">Настройки на напомняне</string>
<string name="rmd_EPr_alerts_summary">Тихи часове, опции за отлагане, ниво на настойчивост</string>
<string name="rmd_EPr_enable_quiet_title">Активиране на тихи часове</string>
<string name="rmd_EPr_quiet_hours_start_title">Тихи часове начало</string>
<string name="rmd_EPr_quiet_hours_start_desc">Уведомленията ще бъдат тихи след %s.\nЗабележка: вибрациите се контролират от настройките по-долу</string>

@ -365,8 +365,6 @@
<string name="rmd_NoA_done">Dokončeno!</string>
<string name="rmd_NoA_snooze">Později...</string>
<string name="rmd_NoA_dlg_title">Připomenutí:</string>
<string name="rmd_EPr_alerts_header">Nastavení upomínek</string>
<string name="rmd_EPr_alerts_summary">Čas klidu, nastavení odložení, úroveň vytrvalosti</string>
<string name="rmd_EPr_enable_quiet_title">Zapnout klidový režim</string>
<string name="rmd_EPr_quiet_hours_start_title">Nerušit od</string>
<string name="rmd_EPr_quiet_hours_desc_none">Tichý režim zakázán</string>

@ -191,7 +191,6 @@
<string name="rmd_NoA_filter">Påmindelse!</string>
<string name="rmd_NoA_done">Allerede udført!</string>
<string name="rmd_NoA_snooze">Slumrefunktion...</string>
<string name="rmd_EPr_alerts_header">Påmindelsesopsætning</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_desc_none">Stille timer er deaktiveret</string>

@ -371,8 +371,6 @@
<string name="rmd_NoA_done">Abgeschlossen</string>
<string name="rmd_NoA_snooze">Schlummern</string>
<string name="rmd_NoA_dlg_title">Erinnerung:</string>
<string name="rmd_EPr_alerts_header">Erinnerungs-Einstellungen</string>
<string name="rmd_EPr_alerts_summary">Ruhezeiten, Schlummer-Einstellungen, Hartnäckigkeit</string>
<string name="rmd_EPr_enable_quiet_title">Stille Stunden aktivieren</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>

@ -373,8 +373,6 @@
<string name="rmd_NoA_done">Ολοκληρωμένο</string>
<string name="rmd_NoA_snooze">Αναβολή</string>
<string name="rmd_NoA_dlg_title">Υπενθύμιση:</string>
<string name="rmd_EPr_alerts_header">Ρυθμίσεις υπενθυμίσεων</string>
<string name="rmd_EPr_alerts_summary">Ώρες ησυχίας, ρυθμίσεις αναβολής, επίπεδο επιμονής</string>
<string name="rmd_EPr_enable_quiet_title">Ενεργοποίηση ωρών ησυχίας</string>
<string name="rmd_EPr_quiet_hours_start_title">Ξεκίνησε η ώρα ησυχίας </string>
<string name="rmd_EPr_quiet_hours_start_desc">Σίγαση υπενθυμίσεων μετά τις %s.\nΣημείωση: η δόνηση ελέγχεται από τη ρύθμιση \"Δόνηση ειδοποιήσεων\"</string>

@ -373,8 +373,6 @@
<string name="rmd_NoA_done">¡Terminada!</string>
<string name="rmd_NoA_snooze">Dilación</string>
<string name="rmd_NoA_dlg_title">Recordatorio:</string>
<string name="rmd_EPr_alerts_header">Configurar recordatorios</string>
<string name="rmd_EPr_alerts_summary">Horario en silencio, opciones al posponer, nivel de persistencia</string>
<string name="rmd_EPr_enable_quiet_title">Habilitar horario en silencio</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>

@ -372,8 +372,6 @@
<string name="rmd_NoA_done">Déjà fait !</string>
<string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
<string name="rmd_NoA_dlg_title">Rappel :</string>
<string name="rmd_EPr_alerts_header">Paramètres de rappel</string>
<string name="rmd_EPr_alerts_summary">Heures de repos, options de report, niveau de persistance</string>
<string name="rmd_EPr_enable_quiet_title">Activer le mode silencieux</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>

@ -332,8 +332,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
<string name="rmd_NoA_done">Completata</string>
<string name="rmd_NoA_snooze">Rimanda...</string>
<string name="rmd_NoA_dlg_title">Promemoria:</string>
<string name="rmd_EPr_alerts_header">Impostazioni promemoria</string>
<string name="rmd_EPr_alerts_summary">Ore tranquille, funzione di ripetizione, livello di persistenza</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_desc_none">Ora inizio silenzio non abilitato</string>

@ -371,8 +371,6 @@
<string name="rmd_NoA_done">בוצעה</string>
<string name="rmd_NoA_snooze">השתק</string>
<string name="rmd_NoA_dlg_title">תזכורת:</string>
<string name="rmd_EPr_alerts_header">הגדרות תזכורת</string>
<string name="rmd_EPr_alerts_summary">שעות שקטות, אשפרויות נימנום, רמת המשכות</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_desc_none">תכונת «שעות שקט» אינה פעילה</string>

@ -377,8 +377,6 @@
<string name="rmd_NoA_done">既に完了しています!</string>
<string name="rmd_NoA_snooze">スヌーズ</string>
<string name="rmd_NoA_dlg_title">お知らせ.</string>
<string name="rmd_EPr_alerts_header">通知の設定</string>
<string name="rmd_EPr_alerts_summary">消音時間帯, スヌーズオプション, 持続レベル</string>
<string name="rmd_EPr_enable_quiet_title">消音時間帯を有効にする</string>
<string name="rmd_EPr_quiet_hours_start_title">消音時間の始まり</string>
<string name="rmd_EPr_quiet_hours_start_desc">%s 以降、通知音は鳴りません</string>

@ -379,8 +379,6 @@
<string name="rmd_NoA_done">완료</string>
<string name="rmd_NoA_snooze">알림 잠시 미루기</string>
<string name="rmd_NoA_dlg_title">알림:</string>
<string name="rmd_EPr_alerts_header">알림 설정</string>
<string name="rmd_EPr_alerts_summary">알람 꺼짐 시간, 스누즈 설정, 알람 지속 레벨</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_desc_none">알림 꺼짐을 사용하지 않습니다</string>

@ -176,7 +176,6 @@
<string name="rmd_NoA_filter">Påminnelse!</string>
<string name="rmd_NoA_done">Allerede utført!</string>
<string name="rmd_NoA_snooze">Slumre</string>
<string name="rmd_EPr_alerts_header">Påminnelseinnstillinger</string>
<string name="rmd_EPr_quiet_hours_start_title">Stilletimer start</string>
<string name="rmd_EPr_quiet_hours_desc_none">Stilletimer er deaktivert</string>
<string name="rmd_EPr_quiet_hours_end_title">Stilletimer slutt</string>

@ -374,8 +374,6 @@
<string name="rmd_NoA_done">Reeds voltooid!</string>
<string name="rmd_NoA_snooze">Sluimeren...</string>
<string name="rmd_NoA_dlg_title">Herinnering:</string>
<string name="rmd_EPr_alerts_header">Instellingen herinneringen</string>
<string name="rmd_EPr_alerts_summary">Rustige uren, snooze opties, niveau volhouden</string>
<string name="rmd_EPr_enable_quiet_title">Stel stille tijd in</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>

@ -377,8 +377,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
<string name="rmd_NoA_done">Już wykonano!</string>
<string name="rmd_NoA_snooze">Wstrzymaj...</string>
<string name="rmd_NoA_dlg_title">Przypomnienie:</string>
<string name="rmd_EPr_alerts_header">Ustawienia przypomnień</string>
<string name="rmd_EPr_alerts_summary">Ciche godziny, opcje drzemki, poziom trwania</string>
<string name="rmd_EPr_enable_quiet_title">Włącz ciche godziny</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>

@ -371,8 +371,6 @@
<string name="rmd_NoA_done">Concluída</string>
<string name="rmd_NoA_snooze">Adiar</string>
<string name="rmd_NoA_dlg_title">Lembrete:</string>
<string name="rmd_EPr_alerts_header">Configurações de lembretes</string>
<string name="rmd_EPr_alerts_summary">Horas quieto, opções de soneca, nível de persistência</string>
<string name="rmd_EPr_enable_quiet_title">Ativar horas de silêncio</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>

@ -377,8 +377,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
<string name="rmd_NoA_filter">Lembrete!</string>
<string name="rmd_NoA_done">Terminada</string>
<string name="rmd_NoA_dlg_title">Lembrete:</string>
<string name="rmd_EPr_alerts_header">Definições do lembrete</string>
<string name="rmd_EPr_alerts_summary">Horas de silêncio, opções de snooze, nível de persistência</string>
<string name="rmd_EPr_enable_quiet_title">Ativar horas de silêncio</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>

@ -378,8 +378,6 @@
<string name="rmd_NoA_done">Уже готово!</string>
<string name="rmd_NoA_snooze">Повтор</string>
<string name="rmd_NoA_dlg_title">Напоминания:</string>
<string name="rmd_EPr_alerts_header">Настройки напоминаний</string>
<string name="rmd_EPr_alerts_summary">Тихие часы, повторные напоминания и уровень настойчивости</string>
<string name="rmd_EPr_enable_quiet_title">Настроить тихие часы</string>
<string name="rmd_EPr_quiet_hours_start_title">Начало тихих часов</string>
<string name="rmd_EPr_quiet_hours_start_desc">Уведомления будут беззвучными после %s.\nПримечание: вибрация управляется настройками ниже!</string>

@ -376,8 +376,6 @@
<string name="rmd_NoA_done">Končano</string>
<string name="rmd_NoA_snooze">Dremež</string>
<string name="rmd_NoA_dlg_title">Opomnik:</string>
<string name="rmd_EPr_alerts_header">Nastavitve opomnika</string>
<string name="rmd_EPr_alerts_summary">Tihi čas, možnosti dremeža, stopnja vztrajnosti</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_desc_none">Tihe ure onemogočene</string>

@ -366,8 +366,6 @@ och återställer dina aktuella uppgifter från en backup
<string name="rmd_NoA_done">Redan klar!</string>
<string name="rmd_NoA_snooze">Vänta...</string>
<string name="rmd_NoA_dlg_title">Påminnelse:</string>
<string name="rmd_EPr_alerts_header">Påminnelseinställningar</string>
<string name="rmd_EPr_alerts_summary">Tysta timmar, snooze alternativ, envishets-nivå</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_desc_none">Tyst period är inaktiverad</string>

@ -334,8 +334,6 @@
<string name="rmd_NoA_done">Tamamlandı</string>
<string name="rmd_NoA_snooze">Ertele</string>
<string name="rmd_NoA_dlg_title">Hatırlatıcı:</string>
<string name="rmd_EPr_alerts_header">Hatırlatıcı Ayarları</string>
<string name="rmd_EPr_alerts_summary">Sessiz saatler, erteleme seçenekleri, süreklilik düzeyi</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_desc_none">Sessiz saatler kapalı</string>

@ -379,8 +379,6 @@
<string name="rmd_NoA_done">Виконано!</string>
<string name="rmd_NoA_snooze">Відкласти</string>
<string name="rmd_NoA_dlg_title">Нагадування:</string>
<string name="rmd_EPr_alerts_header">Налаштування нагадувань</string>
<string name="rmd_EPr_alerts_summary">Тихі години, опції короткого сну, рівень наполегливості</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_desc_none">Тихі години вимкнено</string>

@ -312,8 +312,6 @@
<string name="rmd_NoA_done">已完成!</string>
<string name="rmd_NoA_snooze">晚点提醒...</string>
<string name="rmd_NoA_dlg_title">提醒:</string>
<string name="rmd_EPr_alerts_header">提醒设置</string>
<string name="rmd_EPr_alerts_summary">勿扰模式,稍候提醒,持续提醒</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_desc_none">未设定无声时间</string>

@ -352,8 +352,6 @@
<string name="rmd_NoA_done">已完成!</string>
<string name="rmd_NoA_snooze">晚點提醒...</string>
<string name="rmd_NoA_dlg_title">提醒:</string>
<string name="rmd_EPr_alerts_header">提醒設置</string>
<string name="rmd_EPr_alerts_summary">勿擾模式,稍候提醒,持續提醒</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_desc_none">未設定無聲功能</string>

@ -9,6 +9,7 @@
<!-- ======================================================== REMINDERS == -->
<string name="p_rmd_enabled">notif_enabled</string>
<!-- boolean : whether to enable quiet hours or not -->
<string name="p_rmd_enable_quiet">enable_qhours</string>

@ -70,10 +70,6 @@
<!-- ============================================= reminder preferences == -->
<!-- slide 33d: Reminder Preference Screen Title -->
<string name="rmd_EPr_alerts_header">Reminder settings</string>
<string name="rmd_EPr_alerts_summary">Quiet hours, snooze options, persistence level</string>
<!-- Reminder Preference: Quiet Hours Start Title -->
<string name="rmd_EPr_enable_quiet_title">Enable quiet hours</string>
<!-- Reminder Preference: Quiet Hours Start Title -->

@ -117,6 +117,7 @@
<string name="widget_hide_checkboxes">Hide checkboxes</string>
<string name="widget_hide_header">Hide header</string>
<string name="widget_transparent_background">Transparent background</string>
<string name="notifications">Notifications</string>
<string-array name="sync_SPr_interval_entries">
<!-- sync_SPr_interval_entries: Synchronization Intervals -->

@ -4,10 +4,15 @@
** See the file "LICENSE" for the full license governing this code.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/rmd_EPr_alerts_header">
android:title="@string/notifications">
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/p_rmd_enabled"
android:title="@string/notifications" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="@string/p_rmd_enabled"
android:key="@string/p_rmd_enable_quiet"
android:title="@string/rmd_EPr_enable_quiet_title" />
<org.tasks.ui.TimePreference
@ -22,20 +27,25 @@
android:title="@string/rmd_EPr_quiet_hours_end_title" />
<org.tasks.ui.TimePreference
android:defaultValue="@integer/default_remind_time"
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:dependency="@string/p_rmd_enabled"
android:key="@string/p_rmd_persistent"
android:title="@string/rmd_EPr_persistent_title" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:defaultValue="false"
android:dependency="@string/p_rmd_enabled"
android:key="@string/p_rmd_maxvolume"
android:title="@string/rmd_EPr_multiple_maxvolume_title" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:defaultValue="true"
android:dependency="@string/p_rmd_enabled"
android:key="@string/p_rmd_vibrate"
android:title="@string/rmd_EPr_vibrate_title" />
<RingtonePreference
android:dependency="@string/p_rmd_enabled"
android:key="@string/p_rmd_ringtone"
android:ringtoneType="notification"
android:showDefault="true"

Loading…
Cancel
Save