Remove LED notification color preference

pull/574/head
Alex Baker 7 years ago
parent f301ef92c8
commit 62e37459bc

@ -6,7 +6,6 @@
package com.todoroo.andlib.utility;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ContentValues;
import android.content.Context;
import android.os.Build;
@ -217,6 +216,10 @@ public class AndroidUtilities {
return !atLeastJellybean();
}
public static boolean preOreo() {
return !atLeastOreo();
}
public static boolean atLeastJellybeanMR1() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;
}
@ -237,7 +240,7 @@ public class AndroidUtilities {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
}
public static boolean atLeastO() {
public static boolean atLeastOreo() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
}

@ -18,9 +18,7 @@ import android.support.annotation.NonNull;
import android.support.v4.app.JobIntentService;
import org.tasks.R;
import org.tasks.activities.ColorPickerActivity;
import org.tasks.activities.TimePickerActivity;
import org.tasks.dialogs.ColorPickerDialog;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingPreferenceActivity;
import org.tasks.jobs.JobManager;
@ -31,7 +29,6 @@ import org.tasks.preferences.PermissionRequestor;
import org.tasks.preferences.Preferences;
import org.tasks.scheduling.GeofenceSchedulingIntentService;
import org.tasks.scheduling.NotificationSchedulerIntentService;
import org.tasks.themes.LEDColor;
import org.tasks.themes.ThemeCache;
import org.tasks.time.DateTime;
import org.tasks.ui.TimePreference;
@ -39,6 +36,8 @@ import org.tasks.ui.TimePreference;
import javax.inject.Inject;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybean;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo;
import static com.todoroo.andlib.utility.AndroidUtilities.preOreo;
import static org.tasks.PermissionUtil.verifyPermissions;
public class ReminderPreferences extends InjectingPreferenceActivity {
@ -46,7 +45,6 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
private static final int REQUEST_QUIET_START = 10001;
private static final int REQUEST_QUIET_END = 10002;
private static final int REQUEST_DEFAULT_REMIND = 10003;
private static final int REQUEST_LED_PICKER = 10004;
@Inject Device device;
@Inject ActivityPermissionRequestor permissionRequestor;
@ -80,17 +78,9 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
initializeTimePreference(getQuietStartPreference(), REQUEST_QUIET_START);
initializeTimePreference(getQuietEndPreference(), REQUEST_QUIET_END);
findPreference(getString(R.string.p_led_color)).setOnPreferenceClickListener(preference -> {
Intent intent = new Intent(ReminderPreferences.this, ColorPickerActivity.class);
intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPickerDialog.ColorPalette.LED);
startActivityForResult(intent, REQUEST_LED_PICKER);
return false;
});
requires(R.string.notification_shade, atLeastJellybean(), R.string.p_notification_priority);
requires(device.supportsLocationServices(), R.string.geolocation_reminders);
updateLEDColor();
requires(preOreo(), R.string.p_rmd_ringtone, R.string.p_led_notification);
}
private void rescheduleNotificationsOnChange(int... resIds) {
@ -153,12 +143,7 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_LED_PICKER) {
if (resultCode == RESULT_OK) {
preferences.setInt(R.string.p_led_color, data.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 4));
updateLEDColor();
}
} else if (requestCode == REQUEST_QUIET_START) {
if (requestCode == REQUEST_QUIET_START) {
if (resultCode == RESULT_OK) {
getQuietStartPreference().handleTimePickerActivityIntent(data);
}
@ -195,10 +180,4 @@ public class ReminderPreferences extends InjectingPreferenceActivity {
public void inject(ActivityComponent component) {
component.inject(this);
}
private void updateLEDColor() {
int index = preferences.getInt(R.string.p_led_color, 4);
LEDColor ledColor = themeCache.getLEDColor(index);
findPreference(getString(R.string.p_led_color)).setSummary(ledColor.getName());
}
}

@ -34,7 +34,7 @@ public class ColorPickerDialog extends InjectingDialogFragment {
private static final String EXTRA_PALETTE = "extra_palette";
private static final String EXTRA_SHOW_NONE = "extra_show_none";
public enum ColorPalette {THEMES, COLORS, ACCENTS, WIDGET_BACKGROUND, LED}
public enum ColorPalette {THEMES, COLORS, ACCENTS, WIDGET_BACKGROUND}
public interface ThemePickerCallback {
void themePicked(ColorPalette palette, int index);
@ -155,8 +155,6 @@ public class ColorPickerDialog extends InjectingDialogFragment {
return R.array.accents;
case WIDGET_BACKGROUND:
return R.array.widget_background;
case LED:
return R.array.led;
default:
return R.array.themes;
}
@ -170,14 +168,12 @@ public class ColorPickerDialog extends InjectingDialogFragment {
return themeCache.getThemeAccent(index).getAccentColor();
case WIDGET_BACKGROUND:
return themeCache.getWidgetTheme(index).getBackgroundColor();
case LED:
return themeCache.getLEDColor(index).getColor();
default:
return themeCache.getThemeBase(index).getContentBackground();
}
}
private int getNumFree() {
return palette == ColorPalette.LED ? themeCache.getLEDColorCount() : 2;
return 2;
}
}

@ -10,7 +10,7 @@ import org.tasks.preferences.Preferences;
import javax.inject.Inject;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastO;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo;
public class NotificationManager {
@ -23,11 +23,11 @@ public class NotificationManager {
this.preferences = preferences;
notificationManager = (android.app.NotificationManager)
context.getSystemService(Context.NOTIFICATION_SERVICE);
if (atLeastO()) {
if (atLeastOreo()) {
String channelName = context.getString(R.string.notifications);
NotificationChannel notificationChannel = new NotificationChannel(DEFAULT_NOTIFICATION_CHANNEL, channelName, android.app.NotificationManager.IMPORTANCE_HIGH);
notificationChannel.enableLights(preferences.isLEDNotificationEnabled());
notificationChannel.enableVibration(preferences.isVibrationEnabled());
notificationChannel.enableLights(true);
notificationChannel.enableVibration(true);
notificationChannel.setLightColor(preferences.getLEDColor());
notificationChannel.setVibrationPattern(preferences.getVibrationPattern());
notificationManager.createNotificationChannel(notificationChannel);

@ -29,6 +29,7 @@ import javax.inject.Inject;
import timber.log.Timber;
import static android.content.SharedPreferences.Editor;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo;
public class Preferences {
@ -95,12 +96,11 @@ public class Preferences {
}
public boolean isLEDNotificationEnabled() {
return getBoolean(R.string.p_led_notification, true);
return atLeastOreo() || getBoolean(R.string.p_led_notification, true);
}
public int getLEDColor() {
int accent = getInt(R.string.p_led_color, 4);
return themeCache.getLEDColor(accent).getColor();
return R.color.led_green;
}
public boolean quietHoursEnabled() {

@ -1,31 +0,0 @@
package org.tasks.themes;
import org.tasks.R;
public class LEDColor {
public static final int[] LED_COLORS = new int[]{
R.color.led_white,
R.color.led_red,
R.color.led_orange,
R.color.led_yellow,
R.color.led_green,
R.color.led_blue,
R.color.led_purple
};
private final String name;
private final int color;
public LEDColor(String name, int color) {
this.name = name;
this.color = color;
}
public String getName() {
return name;
}
public int getColor() {
return color;
}
}

@ -24,7 +24,6 @@ public class ThemeCache {
private final List<ThemeColor> colors = new ArrayList<>();
private final List<ThemeAccent> accents = new ArrayList<>();
private final List<WidgetTheme> widgetThemes = new ArrayList<>();
private final List<LEDColor> led = new ArrayList<>();
private final ThemeColor untaggedColor;
@Inject
@ -64,12 +63,6 @@ public class ThemeCache {
getColor(context, i == 0 ? R.color.black_87 : R.color.white_100),
getColor(context, i == 0 ? R.color.black_54 : R.color.white_70)));
}
String []ledNames = resources.getStringArray(R.array.led);
for (int i = 0 ; i < LEDColor.LED_COLORS.length ; i++) {
led.add(new LEDColor(
ledNames[i],
getColor(context, LEDColor.LED_COLORS[i])));
}
untaggedColor = new ThemeColor(null, 19, getColor(context, R.color.tag_color_none_background), 0, getColor(context, R.color.black_87), false);
}
@ -93,14 +86,6 @@ public class ThemeCache {
return untaggedColor;
}
public LEDColor getLEDColor(int index) {
return led.get(index);
}
public int getLEDColorCount() {
return led.size();
}
private static int resolveAttribute(Resources.Theme theme, int attribute) {
TypedValue typedValue = new TypedValue();
theme.resolveAttribute(attribute, typedValue, true);

@ -185,7 +185,6 @@
<string name="vibration_pause">التوقف أثناء الهزات</string>
<string name="plugin_description">تاسكس هو مشروع مفتوح المصدر مدموع من طرف مطور واحد. بعض الخيارات متوفرة عن الطريق الدفع من داخل التطبيق من أجل دعم التطوير</string>
<string name="opacity">التعتيم</string>
<string name="theme_white">أبيض</string>
<string name="master_sync_warning">المزامنة التلقائية معطلة الآن من طرف أندرويد</string>
<string name="settings_localization">تخصيص اللغة و الجهة</string>
<string name="layout_direction">إتجاه التنسيق</string>

@ -368,7 +368,6 @@
<string name="theme_blue_grey">Синьо-сив</string>
<string name="theme_black">Черен</string>
<string name="theme_dark_grey">Тъмно сива</string>
<string name="theme_white">Бяла</string>
<string name="theme_light">Светла</string>
<string name="theme_dark">Тъмна</string>
<string name="theme_wallpaper">Тапет</string>
@ -386,7 +385,6 @@
<string name="layout_direction_right_to_left">Отдясно наляво</string>
<string name="led_notification">LED нотификация</string>
<string name="hardware_support_required">Изисква се хардуерна поддръжка </string>
<string name="led_color">LED цвят</string>
<string name="no_calendars_found">Не са намерени календари</string>
<string name="widget_settings">Настройки на widget </string>
<string name="widget_header_settings">Настройки на заглавието</string>

@ -136,7 +136,6 @@
<string name="high_priority">Alta</string>
<string name="default_priority">Predeterminat</string>
<string name="low_priority">Baix</string>
<string name="theme_white">Blanc</string>
<string name="language">Idioma</string>
<string name="settings_localization">Localització</string>
<string name="layout_direction_left_to_right">D\'esquerra a dreta</string>

@ -314,7 +314,6 @@
<string name="theme_grey">Šedá</string>
<string name="theme_blue_grey">Modrošedá</string>
<string name="theme_black">Černá</string>
<string name="theme_white">Bílý</string>
<string name="theme_light">Světlý</string>
<string name="theme_dark">Tmavý</string>
<string name="theme_wallpaper">Tapeta</string>
@ -330,7 +329,6 @@
<string name="layout_direction">Orientace</string>
<string name="layout_direction_left_to_right">Zleva do prava</string>
<string name="layout_direction_right_to_left">Zprava do leva</string>
<string name="led_color">Barva LED</string>
<string name="no_calendars_found">Nenalezeny žádné kalendáře</string>
<string name="widget_settings">Nastavení widgetu</string>
</resources>

@ -356,7 +356,6 @@
<string name="theme_blue_grey">Blaugrau</string>
<string name="theme_black">Schwarz</string>
<string name="theme_dark_grey">Dunkelgrau</string>
<string name="theme_white">Weiß</string>
<string name="theme_light">Hell</string>
<string name="theme_dark">Dunkel</string>
<string name="theme_wallpaper">Hintergrundbild</string>
@ -374,7 +373,6 @@
<string name="layout_direction_right_to_left">Rechts nach links</string>
<string name="led_notification">Benachrichtigungs-LED</string>
<string name="hardware_support_required">Hardware-Unterstützung benötigt</string>
<string name="led_color">LED-Farbe</string>
<string name="no_calendars_found">Es wurden keine Kalender gefunden</string>
<string name="widget_settings">Widget-Einstellungen</string>
<string name="widget_header_settings">Kopf-Einstellungen</string>

@ -363,7 +363,6 @@
<string name="theme_blue_grey">Gris azulado</string>
<string name="theme_black">Negro</string>
<string name="theme_dark_grey">Gris oscuro</string>
<string name="theme_white">Blanco</string>
<string name="theme_light">Claro</string>
<string name="theme_dark">Oscuro</string>
<string name="theme_wallpaper">Fondo de pantalla</string>
@ -380,7 +379,6 @@
<string name="layout_direction_right_to_left">De derecha a izquierda</string>
<string name="led_notification">Notificación de la LED</string>
<string name="hardware_support_required">Apoyo de hardware requerido</string>
<string name="led_color">Color de la LED</string>
<string name="no_calendars_found">No se han encontrado calendarios</string>
<string name="widget_settings">Configuración de widget</string>
<string name="widget_header_settings">Configuración de encabezado</string>

@ -252,7 +252,6 @@
<string name="default_list">لیست پیش فرض</string>
<string name="plugin_description">Tasks پروژه‌ای متن‌باز است که عمدتاً توسط یک‌نفر توسعه داده می‌شود. برای حمایت از این تلاش، برخی ویژگی‌ها به‌صورت خریدهای داخل برنامه ارائه شده‌اند.</string>
<string name="opacity">شفافیت</string>
<string name="theme_white">سفید</string>
<string name="master_sync_warning">درحال‌حاضر هماهنگ‌سازی خودکار توسط اندروید غیرفعال است</string>
<string name="settings_general">عمومی</string>
<string name="language">زبان</string>

@ -366,7 +366,6 @@
<string name="theme_blue_grey">Siniharmaa</string>
<string name="theme_black">Musta</string>
<string name="theme_dark_grey">Tumma harmaa</string>
<string name="theme_white">Valkoinen</string>
<string name="theme_light">Vaalea</string>
<string name="theme_dark">Tumma</string>
<string name="theme_wallpaper">Taustakuva</string>
@ -384,7 +383,6 @@
<string name="layout_direction_right_to_left">Oikealta vasemmalle</string>
<string name="led_notification">LED muistutus</string>
<string name="hardware_support_required">Laitetuki vaaditaan</string>
<string name="led_color">LED väri</string>
<string name="no_calendars_found">Kalenteria ei löydy</string>
<string name="widget_settings">Widgetin asetukset</string>
<string name="widget_header_settings">Otsikon asetukset</string>

@ -354,7 +354,6 @@
<string name="theme_blue_grey">Gris Bleu</string>
<string name="theme_black">Noir</string>
<string name="theme_dark_grey">Gris Noir</string>
<string name="theme_white">Blanc</string>
<string name="theme_light">Lumière</string>
<string name="theme_dark">Noir</string>
<string name="theme_wallpaper">Fond d\'écran</string>
@ -372,7 +371,6 @@
<string name="layout_direction_right_to_left">Droite à gauche</string>
<string name="led_notification">Notification de la LED</string>
<string name="hardware_support_required">Support matériel requis</string>
<string name="led_color">Couleur de la LED</string>
<string name="no_calendars_found">Pas de calendriers trouvés</string>
<string name="widget_settings">Paramètres du Widget</string>
<string name="widget_header_settings">Paramètres de l\'en-tête</string>

@ -365,7 +365,6 @@
<string name="theme_blue_grey">Gris azulado</string>
<string name="theme_black">Negro</string>
<string name="theme_dark_grey">Gris oscuro</string>
<string name="theme_white">Blanco</string>
<string name="theme_light">Claro</string>
<string name="theme_dark">Oscuro</string>
<string name="theme_wallpaper">Fondo de pantalla</string>
@ -383,7 +382,6 @@
<string name="layout_direction_right_to_left">De derecha a izquierda</string>
<string name="led_notification">Notificación de la LED</string>
<string name="hardware_support_required">Apoyo de hardware requerido</string>
<string name="led_color">Color de la LED</string>
<string name="no_calendars_found">No se han encontrado calendarios</string>
<string name="widget_settings">Configuración de widget</string>
<string name="widget_header_settings">Configuración de encabezado</string>

@ -368,7 +368,6 @@
<string name="theme_blue_grey">Szürkéskék</string>
<string name="theme_black">Fekete</string>
<string name="theme_dark_grey">Sötétszürke</string>
<string name="theme_white">Fehér</string>
<string name="theme_light">Világos</string>
<string name="theme_dark">Sötét</string>
<string name="theme_wallpaper">Háttérkép</string>
@ -386,7 +385,6 @@
<string name="layout_direction_right_to_left">Jobbról balra</string>
<string name="led_notification">LED értesítés</string>
<string name="hardware_support_required">Hardveres támogatás szükséges</string>
<string name="led_color">LED színe</string>
<string name="no_calendars_found">Naptár nem található</string>
<string name="widget_settings">Widget beállításai</string>
<string name="widget_header_settings">Fejléc beállításai</string>

@ -364,7 +364,6 @@
<string name="theme_blue_grey">Grigio-Blu</string>
<string name="theme_black">Nero</string>
<string name="theme_dark_grey">Grigio scuro</string>
<string name="theme_white">Bianco</string>
<string name="theme_light">Chiaro</string>
<string name="theme_dark">Scuro</string>
<string name="theme_wallpaper">Sfondo</string>
@ -382,7 +381,6 @@
<string name="layout_direction_right_to_left">Da destra a sinistra</string>
<string name="led_notification">LED di notifica</string>
<string name="hardware_support_required">E\' richiesto il supporto Hardware</string>
<string name="led_color">Colore LED</string>
<string name="no_calendars_found">Nessun calendario</string>
<string name="widget_settings">Impostazioni widget</string>
<string name="widget_header_settings">Impostazioni intestazione</string>

@ -366,7 +366,6 @@
<string name="theme_blue_grey">כחול אפור</string>
<string name="theme_black">שחור</string>
<string name="theme_dark_grey">אפור כהה</string>
<string name="theme_white">לבן</string>
<string name="theme_light">בהיר</string>
<string name="theme_dark">כהה</string>
<string name="theme_wallpaper">תמונת רקע</string>
@ -384,7 +383,6 @@
<string name="layout_direction_right_to_left">מימין לשמאל</string>
<string name="led_notification">תאורת התראות</string>
<string name="hardware_support_required">נדרשת חומרה תואמת</string>
<string name="led_color">צבע תאורת התראות</string>
<string name="no_calendars_found">לא נמצאו לוחות שנה</string>
<string name="widget_settings">הגדרות ווידג\'ט</string>
<string name="widget_header_settings">הגדרות כותרת</string>

@ -366,7 +366,6 @@
<string name="theme_blue_grey">灰青</string>
<string name="theme_black"></string>
<string name="theme_dark_grey">ダークグレー</string>
<string name="theme_white"></string>
<string name="theme_light">ライト</string>
<string name="theme_dark">ダーク</string>
<string name="theme_wallpaper">壁紙</string>
@ -384,7 +383,6 @@
<string name="layout_direction_right_to_left">右から左</string>
<string name="led_notification">LED 通知</string>
<string name="hardware_support_required">ハードウェア サポートが必要です</string>
<string name="led_color">LED の色</string>
<string name="no_calendars_found">カレンダーが見つかりません</string>
<string name="widget_settings">ウィジェット設定</string>
<string name="widget_header_settings">ヘッダー設定</string>

@ -370,7 +370,6 @@
<string name="theme_blue_grey">회청색</string>
<string name="theme_black">검정</string>
<string name="theme_dark_grey">어두운 회색</string>
<string name="theme_white">흰색</string>
<string name="theme_light">밝게</string>
<string name="theme_dark">어둡게</string>
<string name="theme_wallpaper">바탕화면</string>
@ -388,7 +387,6 @@
<string name="layout_direction_right_to_left">오른쪽 정렬</string>
<string name="led_notification">LED 알림</string>
<string name="hardware_support_required">하드웨어 지원을 필요로 합니다. </string>
<string name="led_color">LED 색상</string>
<string name="no_calendars_found">달력 없음</string>
<string name="widget_settings">위젯 설정</string>
<string name="widget_header_settings">헤더 설정</string>

@ -357,7 +357,6 @@
<string name="theme_blue_grey">Blauwgrijs</string>
<string name="theme_black">Zwart</string>
<string name="theme_dark_grey">Donker Groen</string>
<string name="theme_white">Wit</string>
<string name="theme_light">Licht</string>
<string name="theme_dark">Donker</string>
<string name="theme_wallpaper">Achtergrond</string>
@ -374,7 +373,6 @@
<string name="layout_direction_right_to_left">Rechts naar links</string>
<string name="led_notification">LED notificatie</string>
<string name="hardware_support_required">Hardware ondersteuning vereist</string>
<string name="led_color">LED kleur</string>
<string name="no_calendars_found">Geen kalenders gevonden</string>
<string name="widget_settings">Widget instellingen</string>
<string name="widget_header_settings">Titel instellingen</string>

@ -364,7 +364,6 @@
<string name="theme_blue_grey">Niebiesko Szary</string>
<string name="theme_black">Czarny</string>
<string name="theme_dark_grey">Ciemnoszary</string>
<string name="theme_white">Biały</string>
<string name="theme_light">Jasny</string>
<string name="theme_dark">Ciemny</string>
<string name="theme_wallpaper">Tapeta</string>
@ -382,7 +381,6 @@
<string name="layout_direction_right_to_left">Od prawa do lewa</string>
<string name="led_notification">Powiadomienie LED</string>
<string name="hardware_support_required">Wymagane wsparcie sprzętowe</string>
<string name="led_color">Kolor LED</string>
<string name="no_calendars_found">Nie znaleziono kalendzarzy</string>
<string name="widget_settings">Ustawienie widgetu</string>
<string name="widget_header_settings">Ustawienia nagłówka</string>

@ -358,7 +358,6 @@
<string name="theme_blue_grey">Azul Acinzentado</string>
<string name="theme_black">Preto</string>
<string name="theme_dark_grey">Cinza escuro</string>
<string name="theme_white">Branco</string>
<string name="theme_light">Claro</string>
<string name="theme_dark">Escuro</string>
<string name="theme_wallpaper">Plano de fundo</string>
@ -375,7 +374,6 @@
<string name="layout_direction_left_to_right">Esquerda para direita</string>
<string name="layout_direction_right_to_left">Direita para esquerda</string>
<string name="led_notification">LED de notificações</string>
<string name="led_color">Cor do LED</string>
<string name="no_calendars_found">Não foi encontrado nenhum calendário</string>
<string name="widget_settings">Configurações de Widget</string>
<string name="widget_header_settings">Config. cabeçalho</string>

@ -14,7 +14,6 @@
<string name="CFA_context_delete">Sterge linia</string>
<string name="tag_FEx_untagged">Fara categorie</string>
<string name="filters">Filtre</string>
<string name="theme_white">Alb</string>
<string name="layout_direction_left_to_right">Stanga la dreapta</string>
<string name="layout_direction_right_to_left">Dreapta la stânga</string>
</resources>

@ -365,7 +365,6 @@
<string name="theme_blue_grey">Серо-голубой</string>
<string name="theme_black">Чёрная</string>
<string name="theme_dark_grey">Тёмно-серый</string>
<string name="theme_white">Белый</string>
<string name="theme_light">Светлая</string>
<string name="theme_dark">Тёмная</string>
<string name="theme_wallpaper">Как обои</string>
@ -383,7 +382,6 @@
<string name="layout_direction_right_to_left">Справа налево</string>
<string name="led_notification">LED уведомления</string>
<string name="hardware_support_required">Необходима аппаратная поддержка</string>
<string name="led_color">LED цвет</string>
<string name="no_calendars_found">Календарей не найдено</string>
<string name="widget_settings">Настройки виджета</string>
<string name="widget_header_settings">Настройки закоголовка</string>

@ -357,7 +357,6 @@
<string name="theme_blue_grey">Blågrå</string>
<string name="theme_black">Svart</string>
<string name="theme_dark_grey">Mörkgrå</string>
<string name="theme_white">Vit</string>
<string name="theme_light">Ljust</string>
<string name="theme_dark">Mörkt</string>
<string name="theme_wallpaper">Bakgrundsbild</string>
@ -372,7 +371,6 @@
<string name="layout_direction_right_to_left">Höger till vänster</string>
<string name="led_notification">LED Notifiering</string>
<string name="hardware_support_required">Hårdvarustöd krävs</string>
<string name="led_color">LED färg</string>
<string name="no_calendars_found">Inga kalendrar hittades</string>
<string name="widget_settings">Inställningar för widget</string>
<string name="creating_new_list">Skapar ny lista</string>

@ -243,7 +243,6 @@
<string name="tag_already_exists">Etiket zaten var</string>
<string name="plugin_description">Tasks, bir geliştirici tarafından tutulan açık kaynaklı bir projedir. Bazı özellikleri, geliştirmeyi desteklemek için uygulama içi satın alma olarak sunulmaktadır.</string>
<string name="opacity">Şeffaflık</string>
<string name="theme_white">Beyaz</string>
<string name="master_sync_warning">Otomatik eşitleme şu anda Android tarafından devre dışı bırakıldı</string>
<string name="settings_general">Genel</string>
<string name="language">Dil</string>

@ -367,7 +367,6 @@
<string name="theme_blue_grey">Сіро-синій</string>
<string name="theme_black">Чорний</string>
<string name="theme_dark_grey">Темно-сірий</string>
<string name="theme_white">Біла</string>
<string name="theme_light">Світлий</string>
<string name="theme_dark">Темний</string>
<string name="theme_wallpaper">Шпалери</string>
@ -385,7 +384,6 @@
<string name="layout_direction_right_to_left">Зправа наліво</string>
<string name="led_notification">LED-сповіщення</string>
<string name="hardware_support_required">Потрібна підтримка апартних засобів</string>
<string name="led_color">LED колір</string>
<string name="no_calendars_found">Календарів не знайдено</string>
<string name="widget_settings">Налаштування віджету</string>
<string name="widget_header_settings">Налаштування заголовку</string>

@ -238,5 +238,4 @@
<string name="layout_direction">排版方向</string>
<string name="layout_direction_left_to_right">由左至右</string>
<string name="layout_direction_right_to_left">由右至左</string>
<string name="led_color">LED 顏色</string>
</resources>

@ -119,16 +119,6 @@
<item>@string/theme_deep_orange</item>
</string-array>
<string-array name="led">
<item>@string/theme_white</item>
<item>@string/theme_red</item>
<item>@string/theme_orange</item>
<item>@string/theme_yellow</item>
<item>@string/theme_green</item>
<item>@string/theme_blue</item>
<item>@string/theme_purple</item>
</string-array>
<string-array name="widget_background">
<item>@string/theme_light</item>
<item>@string/theme_black</item>

@ -278,7 +278,6 @@
<string name="p_gtasks_default_list">default_gtasks_list</string>
<string name="p_language">language</string>
<string name="p_layout_direction">layout_direction</string>
<string name="p_led_color">led_color</string>
<string name="p_led_notification">led_notificatiWCAon</string>
<string name="p_widget_filter">widget-id-</string>

@ -761,7 +761,6 @@ File %1$s contained %2$s.\n\n
<string name="theme_blue_grey">Blue grey</string>
<string name="theme_black">Black</string>
<string name="theme_dark_grey">Dark grey</string>
<string name="theme_white">White</string>
<string name="theme_light">Light</string>
<string name="theme_dark">Dark</string>
<string name="theme_wallpaper">Wallpaper</string>
@ -780,7 +779,6 @@ File %1$s contained %2$s.\n\n
<string name="layout_direction_right_to_left">Right to left</string>
<string name="led_notification">LED notification</string>
<string name="hardware_support_required">Hardware support required</string>
<string name="led_color">LED color</string>
<string name="no_calendars_found">No calendars found</string>
<string name="widget_settings">Widget settings</string>
<string name="widget_header_settings">Header settings</string>

@ -20,6 +20,12 @@
android:showDefault="true"
android:showSilent="true"
android:title="@string/sound" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="@string/p_rmd_enabled"
android:key="@string/p_led_notification"
android:title="@string/led_notification"
android:summary="@string/hardware_support_required"/>
<CheckBoxPreference
android:defaultValue="false"
android:dependency="@string/p_rmd_enabled"
@ -57,26 +63,6 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/led_notification">
<Preference
android:selectable="false"
android:summary="@string/hardware_support_required" />
<CheckBoxPreference
android:defaultValue="true"
android:dependency="@string/p_rmd_enabled"
android:key="@string/p_led_notification"
android:title="@string/enabled"/>
<Preference
android:key="@string/p_led_color"
android:dependency="@string/p_led_notification"
android:title="@string/led_color" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/vibrations">

Loading…
Cancel
Save