diff --git a/src/amazon/java/org/tasks/injection/ActivityComponent.java b/src/amazon/java/org/tasks/injection/ActivityComponent.java index 7d6f1ccef..de64d2914 100644 --- a/src/amazon/java/org/tasks/injection/ActivityComponent.java +++ b/src/amazon/java/org/tasks/injection/ActivityComponent.java @@ -27,7 +27,7 @@ import org.tasks.files.MyFilePickerActivity; import org.tasks.locale.ui.activity.TaskerSettingsActivity; import org.tasks.preferences.AppearancePreferences; import org.tasks.preferences.BasicPreferences; -import org.tasks.preferences.DateShortcutPreferences; +import org.tasks.preferences.DateTimePreferences; import org.tasks.preferences.HelpAndFeedbackActivity; import org.tasks.preferences.MiscellaneousPreferences; import org.tasks.reminders.MissedCallActivity; @@ -109,7 +109,7 @@ public interface ActivityComponent { void inject(HelpAndFeedbackActivity helpAndFeedbackActivity); - void inject(DateShortcutPreferences dateShortcutPreferences); + void inject(DateTimePreferences dateTimePreferences); void inject(AppearancePreferences appearancePreferences); diff --git a/src/generic/java/org/tasks/injection/ActivityComponent.java b/src/generic/java/org/tasks/injection/ActivityComponent.java index 7d6f1ccef..de64d2914 100644 --- a/src/generic/java/org/tasks/injection/ActivityComponent.java +++ b/src/generic/java/org/tasks/injection/ActivityComponent.java @@ -27,7 +27,7 @@ import org.tasks.files.MyFilePickerActivity; import org.tasks.locale.ui.activity.TaskerSettingsActivity; import org.tasks.preferences.AppearancePreferences; import org.tasks.preferences.BasicPreferences; -import org.tasks.preferences.DateShortcutPreferences; +import org.tasks.preferences.DateTimePreferences; import org.tasks.preferences.HelpAndFeedbackActivity; import org.tasks.preferences.MiscellaneousPreferences; import org.tasks.reminders.MissedCallActivity; @@ -109,7 +109,7 @@ public interface ActivityComponent { void inject(HelpAndFeedbackActivity helpAndFeedbackActivity); - void inject(DateShortcutPreferences dateShortcutPreferences); + void inject(DateTimePreferences dateTimePreferences); void inject(AppearancePreferences appearancePreferences); diff --git a/src/googleplay/java/org/tasks/injection/ActivityComponent.java b/src/googleplay/java/org/tasks/injection/ActivityComponent.java index 5d0493eb6..400cd5b92 100644 --- a/src/googleplay/java/org/tasks/injection/ActivityComponent.java +++ b/src/googleplay/java/org/tasks/injection/ActivityComponent.java @@ -29,7 +29,7 @@ import org.tasks.files.MyFilePickerActivity; import org.tasks.locale.ui.activity.TaskerSettingsActivity; import org.tasks.preferences.AppearancePreferences; import org.tasks.preferences.BasicPreferences; -import org.tasks.preferences.DateShortcutPreferences; +import org.tasks.preferences.DateTimePreferences; import org.tasks.preferences.HelpAndFeedbackActivity; import org.tasks.preferences.MiscellaneousPreferences; import org.tasks.reminders.MissedCallActivity; @@ -116,7 +116,7 @@ public interface ActivityComponent { void inject(HelpAndFeedbackActivity helpAndFeedbackActivity); - void inject(DateShortcutPreferences dateShortcutPreferences); + void inject(DateTimePreferences dateTimePreferences); void inject(AppearancePreferences appearancePreferences); diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 5f941f158..3b0718bf9 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -289,8 +289,8 @@ android:theme="@style/Tasks" /> { final DateTime current = new DateTime().withMillisOfDay(preference.getMillisOfDay()); - Intent intent = new Intent(DateShortcutPreferences.this, TimePickerActivity.class); + Intent intent = new Intent(DateTimePreferences.this, TimePickerActivity.class); intent.putExtra(TimePickerActivity.EXTRA_TIMESTAMP, current.getMillis()); startActivityForResult(intent, requestCode); return true; diff --git a/src/main/java/org/tasks/preferences/Preferences.java b/src/main/java/org/tasks/preferences/Preferences.java index b6e8550d9..ec5f3cb1d 100644 --- a/src/main/java/org/tasks/preferences/Preferences.java +++ b/src/main/java/org/tasks/preferences/Preferences.java @@ -114,7 +114,7 @@ public class Preferences { public void setDefaults() { PreferenceManager.setDefaultValues(context, R.xml.preferences, true); PreferenceManager.setDefaultValues(context, R.xml.preferences_appearance, true); - PreferenceManager.setDefaultValues(context, R.xml.preferences_date_shortcuts, true); + PreferenceManager.setDefaultValues(context, R.xml.preferences_date_time, true); PreferenceManager.setDefaultValues(context, R.xml.preferences_defaults, true); PreferenceManager.setDefaultValues(context, R.xml.preferences_gtasks, true); PreferenceManager.setDefaultValues(context, R.xml.preferences_misc, true); diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index b30a8ea01..b69f940af 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -293,7 +293,6 @@ Напомняния за геолокация Тагове Филтри - Дати - бърз достъп За час Сутрин Следобед diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 360e36758..015fb9ecc 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -286,7 +286,6 @@ Geo-/Ortsbasierte Erinnerungen Schlagworte Filter - Datumsabkürzungen Für eine Stunde Morgen Nachmittag diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index bff4f1d55..469a2a3d5 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -289,7 +289,6 @@ Recordatorios de Geolocalización Etiquetas Filtros - Atajos para fechas Por una hora Mañana Tarde diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index f60326f0e..9eafeeee6 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -293,7 +293,6 @@ Paikannuksen muistutukset Tunniste Suodattimet - Päivämäärän pikakuvake Tunnin verran Aamu Iltapäivä diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 058aed58e..e8479e316 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -283,7 +283,6 @@ Temps de réponse (les valeurs élevées améliorent l\'autonomie) Rappels géolocalisés Filtres - Raccourcis pour les dates Pour une heure Matin Après-midi diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index bff4f1d55..469a2a3d5 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -289,7 +289,6 @@ Recordatorios de Geolocalización Etiquetas Filtros - Atajos para fechas Por una hora Mañana Tarde diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 8cebc0e16..f5e16c5ef 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -293,7 +293,6 @@ Helyhez kötött Emlékeztetők Címkék Szűrők - Gyorselérésű időpontok Egy órára Reggel Délután diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index dab998d5c..59ff700a9 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -290,7 +290,6 @@ Promemoria Geolocalizzazione Etichette Filtri - Scorciatoie data Per un\'ora Mattina Pomeriggio diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 86b36157a..534681ccc 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -291,7 +291,6 @@ התראות מיקום תגיות פילטרים - קיצורי תאריך בעוד שעה בוקר אחר הצהריים diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index d0d24ab48..274b15589 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -291,7 +291,6 @@ 位置情報リマインダー タグ フィルター - 日付のショートカット 1時間 朝 昼 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index fd0e7e2dc..468a575f1 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -287,7 +287,6 @@ 위치정보 알림 태그 필터 - 날짜 바로가기 한 시간동안 아침 오후 diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 6311d8e6c..43c146adf 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -286,7 +286,6 @@ Antwoord tijd (hogere waarde verbruikt meer batterij) Geolocatie Herinneringen Labels - Datum snelkoppelingen Voor een uur Ochtend Middag diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 3f356b348..d7fbdda31 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -290,7 +290,6 @@ Przypomnienie geolokacyjne Tagi Filtry - Skróty dat Na godzinę Rano Po południu diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index f77b59140..b3f1eea50 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -265,7 +265,6 @@ Lembretes de geolocalização Etiquetas Filtros - Atalhos de data Por uma hora Manhã Tarde diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 7626865fb..eb3eb27a3 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -290,7 +290,6 @@ Напоминания по местонахождению: Теги Фильтры - Метки по времени Через час Утро Обед diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index d766ce518..c26a7459f 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -290,7 +290,6 @@ Platsbaserade påminnelser Etiketter Filter - Snabbval tid En timme På morgonen På eftermiddagen diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 56b8e3865..ee14be500 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -293,7 +293,6 @@ Геолокаційні нагадування Теги Фільтри - Частини дня На годину Зранку Опівдні diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 5dacb4e1b..b0b91f8c2 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -221,7 +221,6 @@ 贊助 標籤 過濾 - 日期捷徑 過濾器設定 顯示隱藏 顯示已完成 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 45b606299..ab9f3343b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -692,7 +692,6 @@ File %1$s contained %2$s.\n\n Geolocation Reminders Tags Filters - Date shortcuts For an hour Morning Afternoon @@ -819,5 +818,6 @@ File %1$s contained %2$s.\n\n %s deleted Delete selected tasks? Copy selected tasks? + Date and time diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 75022bb2d..47507f4ce 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -35,9 +35,9 @@ android:targetPackage="org.tasks" /> - + diff --git a/src/main/res/xml/preferences_date_shortcuts.xml b/src/main/res/xml/preferences_date_time.xml similarity index 100% rename from src/main/res/xml/preferences_date_shortcuts.xml rename to src/main/res/xml/preferences_date_time.xml diff --git a/src/release/res/xml/google_analytics.xml b/src/release/res/xml/google_analytics.xml index 26d3567a5..a9da5d1d7 100644 --- a/src/release/res/xml/google_analytics.xml +++ b/src/release/res/xml/google_analytics.xml @@ -37,7 +37,7 @@ AppearancePreferences BackupPreferences BasicPreferences - DateShortcutPreferences + DateShortcutPreferences HelpAndFeedbackActivity MiscellaneousPreferences WidgetConfigActivity