am d6360ea9: don\'t return a result from this non-ordered broadcast.
* commit 'd6360ea9b9ebed2a7b571c0270ed1a00e123ca23':
don't return a result from this non-ordered broadcast.
diff --git a/res/layout/timely_fragment.xml b/res/layout/timely_fragment.xml
new file mode 100644
index 0000000..8f94fbe
--- /dev/null
+++ b/res/layout/timely_fragment.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ >
+ <ListView
+ android:id="@+id/timely_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#FFFFFFFF"/>
+
+</LinearLayout>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index b18d182..01fcc0f 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Week"</item>
<item msgid="4298472806133153766">"Maand"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Tydig"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Net as afgewys"</item>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index ae106c9..0424f19 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"ሳምንት"</item>
<item msgid="4298472806133153766">"ወር"</item>
<item msgid="5033084974413793845">"አጀንዳ"</item>
+ <item msgid="1475154959423158110">"በጊዜው"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"ተቀባይነት ካላገኘ ብቻ"</item>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 4d760a0..1e331ad 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"أسبوع"</item>
<item msgid="4298472806133153766">"شهر"</item>
<item msgid="5033084974413793845">"أجندة"</item>
+ <item msgid="1475154959423158110">"في الوقت المناسب"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"في حالة الرفض فقط"</item>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index f7adf0b..6605a24 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Тыдзень"</item>
<item msgid="4298472806133153766">"Месяц"</item>
<item msgid="5033084974413793845">"Парадак дня"</item>
+ <item msgid="1475154959423158110">"Своечасова"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Толькі калі адмоўлена"</item>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index b25776a..3847c13 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Седмица"</item>
<item msgid="4298472806133153766">"Месец"</item>
<item msgid="5033084974413793845">"График"</item>
+ <item msgid="1475154959423158110">"Навременно"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Само при отхвърляне"</item>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 7e4f1af..1a1e2f4 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Setmana"</item>
<item msgid="4298472806133153766">"Mes"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Puntualment"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Només si es rebutja"</item>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index de29380..ecaadd2 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Týden"</item>
<item msgid="4298472806133153766">"Měsíc"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Timely"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Jen v případě odmítnutí"</item>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index cc9a061..94284fa 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Uge"</item>
<item msgid="4298472806133153766">"Måned"</item>
<item msgid="5033084974413793845">"Dagsorden"</item>
+ <item msgid="1475154959423158110">"Rettidig"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Kun hvis afvist"</item>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 22170e7..6509ddc 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Woche"</item>
<item msgid="4298472806133153766">"Monat"</item>
<item msgid="5033084974413793845">"Terminübersicht"</item>
+ <item msgid="1475154959423158110">"Timely"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Nur bei Ablehnung"</item>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 320344f..3509f0c 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Εβδομάδα"</item>
<item msgid="4298472806133153766">"Μήνας"</item>
<item msgid="5033084974413793845">"Ατζέντα"</item>
+ <item msgid="1475154959423158110">"Εγκαίρως"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Μόνο μετά από απόρριψη"</item>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 943b2cb..e6c38f5 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Week"</item>
<item msgid="4298472806133153766">"Month"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Timely"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Only if declined"</item>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index b09c7a2..839b679 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Semana"</item>
<item msgid="4298472806133153766">"Mes"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Puntual"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Solo si se rechaza"</item>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 518a777..aaf9ffb 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Semana"</item>
<item msgid="4298472806133153766">"Mes"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"En hora"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Solo si se rechaza"</item>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index e7a0338..9e6badc 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Nädal"</item>
<item msgid="4298472806133153766">"Kuu"</item>
<item msgid="5033084974413793845">"Ajakava"</item>
+ <item msgid="1475154959423158110">"Ajastus"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Ainult keeldumisel"</item>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 9d6db9a..58e26e3 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -101,12 +101,7 @@
<item msgid="3466644709343519437">"فقط این رویداد"</item>
<item msgid="140670561403965380">"همه رویدادهای موجود در این مجموعه"</item>
</string-array>
- <string-array name="buttons_list">
- <item msgid="5917946202321434335">"روز"</item>
- <item msgid="6248480754959562740">"هفته"</item>
- <item msgid="4298472806133153766">"ماه"</item>
- <item msgid="5033084974413793845">"دستور جلسه"</item>
- </string-array>
+ <!-- no translation found for buttons_list:4 (1475154959423158110) -->
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"فقط درصورت ردکردن"</item>
<item msgid="6367412240524984286">"درصورت ردکردن یا پاسخ ندادن"</item>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index c7296d3..ecc5b20 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Viikko"</item>
<item msgid="4298472806133153766">"Kuukausi"</item>
<item msgid="5033084974413793845">"Tapahtumat"</item>
+ <item msgid="1475154959423158110">"Ajoissa"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Vain jos kieltäydyn"</item>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 4584983..4165a50 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -101,12 +101,7 @@
<item msgid="3466644709343519437">"Uniquement cet événement"</item>
<item msgid="140670561403965380">"Tous les événements de la série"</item>
</string-array>
- <string-array name="buttons_list">
- <item msgid="5917946202321434335">"Jour"</item>
- <item msgid="6248480754959562740">"Semaine"</item>
- <item msgid="4298472806133153766">"Mois"</item>
- <item msgid="5033084974413793845">"Planning"</item>
- </string-array>
+ <!-- no translation found for buttons_list:4 (1475154959423158110) -->
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Seulement en cas de refus"</item>
<item msgid="6367412240524984286">"Si refus ou pas de réponse"</item>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 6e798b1..fce2a5c 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"सप्ताह"</item>
<item msgid="4298472806133153766">"माह"</item>
<item msgid="5033084974413793845">"कार्यसूची"</item>
+ <item msgid="1475154959423158110">"समय से"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"केवल अस्वीकार होने पर"</item>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 5a61886..785ce8d 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Tjedan"</item>
<item msgid="4298472806133153766">"Mjesec"</item>
<item msgid="5033084974413793845">"Raspored"</item>
+ <item msgid="1475154959423158110">"Pravovremeno"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Samo ako je odbijeno"</item>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 4e6d64f..f6e22ad 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Hét"</item>
<item msgid="4298472806133153766">"Hónap"</item>
<item msgid="5033084974413793845">"Napló"</item>
+ <item msgid="1475154959423158110">"Ismétlés"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Csak elutasítás esetén"</item>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 9fe9299..21d87de 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -101,12 +101,7 @@
<item msgid="3466644709343519437">"Hanya acara ini"</item>
<item msgid="140670561403965380">"Semua acara dalam rangkaian"</item>
</string-array>
- <string-array name="buttons_list">
- <item msgid="5917946202321434335">"Hari"</item>
- <item msgid="6248480754959562740">"Minggu"</item>
- <item msgid="4298472806133153766">"Bulan"</item>
- <item msgid="5033084974413793845">"Agenda"</item>
- </string-array>
+ <!-- no translation found for buttons_list:4 (1475154959423158110) -->
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Hanya jika ditolak"</item>
<item msgid="6367412240524984286">"Jika ditolak atau tidak ditanggapi"</item>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 4a23ac2..5ecf3a6 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -101,12 +101,7 @@
<item msgid="3466644709343519437">"Solo questo evento"</item>
<item msgid="140670561403965380">"Tutti gli eventi nella serie"</item>
</string-array>
- <string-array name="buttons_list">
- <item msgid="5917946202321434335">"Giorno"</item>
- <item msgid="6248480754959562740">"Settimana"</item>
- <item msgid="4298472806133153766">"Mese"</item>
- <item msgid="5033084974413793845">"Ordine del giorno"</item>
- </string-array>
+ <!-- no translation found for buttons_list:4 (1475154959423158110) -->
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Solo se rifiutati"</item>
<item msgid="6367412240524984286">"Se rifiutati o senza risposta"</item>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 939a56d..67696dd 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"שבוע"</item>
<item msgid="4298472806133153766">"חודש"</item>
<item msgid="5033084974413793845">"סדר יום"</item>
+ <item msgid="1475154959423158110">"מתוזמן"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"רק לאחר הבעת סירוב"</item>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 487aca1..c8ef14f 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"週"</item>
<item msgid="4298472806133153766">"月"</item>
<item msgid="5033084974413793845">"予定リスト"</item>
+ <item msgid="1475154959423158110">"適時"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"辞退した場合のみ"</item>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 3bde3b3..273baba 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"주"</item>
<item msgid="4298472806133153766">"월"</item>
<item msgid="5033084974413793845">"일정목록"</item>
+ <item msgid="1475154959423158110">"적절한 때"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"거부한 경우에만 해당"</item>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 41894f6..3956ba0 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Savaitė"</item>
<item msgid="4298472806133153766">"Mėnuo"</item>
<item msgid="5033084974413793845">"Darbotvarkė"</item>
+ <item msgid="1475154959423158110">"Laiku"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Tik jei atmesta"</item>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index db25ed3..77b2099 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Nedēļa"</item>
<item msgid="4298472806133153766">"Mēnesis"</item>
<item msgid="5033084974413793845">"Darba kārtība"</item>
+ <item msgid="1475154959423158110">"Savlaicīgi"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Tikai tad, ja tiek noraidīti"</item>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 0af4343..66c08a7 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Minggu"</item>
<item msgid="4298472806133153766">"Bulan"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Mengikut masa"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Hanya jika ditolak"</item>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 0623b03..924ad9b 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Uke"</item>
<item msgid="4298472806133153766">"Måned"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Timely"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Bare hvis avvist"</item>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index f714558..39ee646 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Week"</item>
<item msgid="4298472806133153766">"Maand"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Op tijd"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Alleen indien geweigerd"</item>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 03738f3..6851b08 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -101,12 +101,7 @@
<item msgid="3466644709343519437">"Tylko to wydarzenie"</item>
<item msgid="140670561403965380">"Wszystkie wydarzenia w serii"</item>
</string-array>
- <string-array name="buttons_list">
- <item msgid="5917946202321434335">"Dzień"</item>
- <item msgid="6248480754959562740">"Tydzień"</item>
- <item msgid="4298472806133153766">"Miesiąc"</item>
- <item msgid="5033084974413793845">"Plan dnia"</item>
- </string-array>
+ <!-- no translation found for buttons_list:4 (1475154959423158110) -->
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Tylko po odrzuceniu"</item>
<item msgid="6367412240524984286">"Po odrzuceniu lub gdy bez odpowiedzi"</item>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 420c575..b4d0726 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Semana"</item>
<item msgid="4298472806133153766">"Mês"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Atempado"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Apenas se recusado"</item>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 0abd44e..b033f3e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Semana"</item>
<item msgid="4298472806133153766">"Mês"</item>
<item msgid="5033084974413793845">"Compromissos"</item>
+ <item msgid="1475154959423158110">"Pontualmente"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Somente se recusou"</item>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 0ea6554..876eff0 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Săptămână"</item>
<item msgid="4298472806133153766">"Lună"</item>
<item msgid="5033084974413793845">"Agendă"</item>
+ <item msgid="1475154959423158110">"În timp util"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Numai dacă sunt respinse"</item>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 5fff3be..b6d6363 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Неделя"</item>
<item msgid="4298472806133153766">"Месяц"</item>
<item msgid="5033084974413793845">"Повестка дня"</item>
+ <item msgid="1475154959423158110">"Периодически"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Только если отклонено"</item>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 82c0202..3022e42 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Týždeň"</item>
<item msgid="4298472806133153766">"Mesiac"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Načas"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Iba ak sú odmietnuté"</item>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 5d7446c..36ba6cd 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -101,12 +101,7 @@
<item msgid="3466644709343519437">"Samo ta dogodek"</item>
<item msgid="140670561403965380">"Vsi dogodki v nizu"</item>
</string-array>
- <string-array name="buttons_list">
- <item msgid="5917946202321434335">"Dan"</item>
- <item msgid="6248480754959562740">"Teden"</item>
- <item msgid="4298472806133153766">"Mesec"</item>
- <item msgid="5033084974413793845">"Dnevni red"</item>
- </string-array>
+ <!-- no translation found for buttons_list:4 (1475154959423158110) -->
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Samo ob zavrnitvi"</item>
<item msgid="6367412240524984286">"Ob zavrnitvi ali neodzivanju"</item>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 52b962f..661bc15 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Недеља"</item>
<item msgid="4298472806133153766">"Месец"</item>
<item msgid="5033084974413793845">"Распоред"</item>
+ <item msgid="1475154959423158110">"Правовремено"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Само за одбијања"</item>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 6fabec6..ab38f5b 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Vecka"</item>
<item msgid="4298472806133153766">"Månad"</item>
<item msgid="5033084974413793845">"Program"</item>
+ <item msgid="1475154959423158110">"I rätt tid"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Endast vid minskade"</item>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 85d14b7..5d48944 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Wiki"</item>
<item msgid="4298472806133153766">"Mwezi"</item>
<item msgid="5033084974413793845">"Ajenda"</item>
+ <item msgid="1475154959423158110">"Kwa muda"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Ikiwa itakataliwa tu"</item>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e1d13a3..8602f7b 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"สัปดาห์"</item>
<item msgid="4298472806133153766">"เดือน"</item>
<item msgid="5033084974413793845">"กำหนดการ"</item>
+ <item msgid="1475154959423158110">"ตรงเวลา"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"หากถูกปฏิเสธเท่านั้น"</item>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 564c04e..6a3d90e 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Linggo"</item>
<item msgid="4298472806133153766">"Buwan"</item>
<item msgid="5033084974413793845">"Agenda"</item>
+ <item msgid="1475154959423158110">"Nasa oras"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Kung tinanggihan lang"</item>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index d6169b1..2ce2f28 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Hafta"</item>
<item msgid="4298472806133153766">"Ay"</item>
<item msgid="5033084974413793845">"Ajanda"</item>
+ <item msgid="1475154959423158110">"Zamanında"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Yalnızca reddedildiyse"</item>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 89595ba..3dfd9f7 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Тиждень"</item>
<item msgid="4298472806133153766">"Місяць"</item>
<item msgid="5033084974413793845">"Порядок денний"</item>
+ <item msgid="1475154959423158110">"Періодично"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Лише якщо відхилено"</item>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 09b617b..6a59f4c 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Tuần"</item>
<item msgid="4298472806133153766">"Tháng"</item>
<item msgid="5033084974413793845">"Lịch biểu"</item>
+ <item msgid="1475154959423158110">"Đúng giờ"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Chỉ khi bị từ chối"</item>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 3bfaad0..fd1b6f0 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"周"</item>
<item msgid="4298472806133153766">"月"</item>
<item msgid="5033084974413793845">"日程"</item>
+ <item msgid="1475154959423158110">"Timely"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"仅在您不参加的情况下"</item>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index ae1113c..9db31ed 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"週"</item>
<item msgid="4298472806133153766">"月"</item>
<item msgid="5033084974413793845">"待辦事項"</item>
+ <item msgid="1475154959423158110">"固定時間"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"僅限拒絕時"</item>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index bf7217d..9ccedab 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -106,6 +106,7 @@
<item msgid="6248480754959562740">"Iviki"</item>
<item msgid="4298472806133153766">"Inyanga"</item>
<item msgid="5033084974413793845">"Ajenda"</item>
+ <item msgid="1475154959423158110">"Isikhathi esijwayelekile"</item>
</string-array>
<string-array name="preferences_skip_reminders_labels">
<item msgid="2285927842308686988">"Uma ngabe kunqatshelwe kuphela"</item>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b14854a..9b1c7a2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -222,6 +222,7 @@
<item>Week</item>
<item>Month</item>
<item>Agenda</item>
+ <item>Timely</item>
</string-array>
<!-- Experimental options for skipping reminders. [CHAR LIMIT = 37] -->
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index d7d553f..1c8fa9c 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -101,6 +101,7 @@
private static final int BUTTON_WEEK_INDEX = 1;
private static final int BUTTON_MONTH_INDEX = 2;
private static final int BUTTON_AGENDA_INDEX = 3;
+ private static final int BUTTON_TIMELY_INDEX = 4;
private CalendarController mController;
private static boolean mIsMultipane;
@@ -487,6 +488,9 @@
case ViewType.MONTH:
mActionBar.setSelectedNavigationItem(BUTTON_MONTH_INDEX);
break;
+ case ViewType.TIMELY:
+ mActionBar.setSelectedNavigationItem(BUTTON_TIMELY_INDEX);
+ break;
default:
mActionBar.setSelectedNavigationItem(BUTTON_DAY_INDEX);
break;
@@ -896,6 +900,16 @@
}
frag = new DayFragment(timeMillis, 1);
break;
+ case ViewType.TIMELY:
+ // TODO: support tabs for tablets
+// if (mActionBar = null && (mActionBar.getSelectedTab() != mDayTab)) {
+// mActionBar.selectTab(mDayTab);
+ // }
+ if (mActionBarMenuSpinnerAdapter != null) {
+ mActionBar.setSelectedNavigationItem(CalendarViewAdapter.TIMELY_BUTTON_INDEX);
+ }
+ frag = new TimelyFragment();
+ break;
case ViewType.MONTH:
if (mActionBar != null && (mActionBar.getSelectedTab() != mMonthTab)) {
mActionBar.selectTab(mMonthTab);
@@ -1289,6 +1303,11 @@
mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.AGENDA);
}
break;
+ case CalendarViewAdapter.TIMELY_BUTTON_INDEX:
+ if (mCurrentView != ViewType.TIMELY) {
+ mController.sendEvent(this, EventType.GO_TO, null, null, -1, ViewType.TIMELY);
+ }
+ break;
default:
Log.w(TAG, "ItemSelected event from unknown button: " + itemPosition);
Log.w(TAG, "CurrentView:" + mCurrentView + " Button:" + itemPosition +
diff --git a/src/com/android/calendar/CalendarController.java b/src/com/android/calendar/CalendarController.java
index 1573371..bf5b6d3 100644
--- a/src/com/android/calendar/CalendarController.java
+++ b/src/com/android/calendar/CalendarController.java
@@ -139,7 +139,8 @@
final int WEEK = 3;
final int MONTH = 4;
final int EDIT = 5;
- final int MAX_VALUE = 5;
+ final int TIMELY = 6;
+ final int MAX_VALUE = 6;
}
public static class EventInfo {
diff --git a/src/com/android/calendar/CalendarViewAdapter.java b/src/com/android/calendar/CalendarViewAdapter.java
index f07d4d8..c82bc9b 100644
--- a/src/com/android/calendar/CalendarViewAdapter.java
+++ b/src/com/android/calendar/CalendarViewAdapter.java
@@ -50,6 +50,7 @@
// Week view: show the month + year
// Month view: show the month + year
// Agenda view: show day of the week + full date underneath
+ // Timely View: Temporary - show the new timely view
private int mCurrentMainView;
private final LayoutInflater mInflater;
@@ -62,6 +63,7 @@
public static final int WEEK_BUTTON_INDEX = 1;
public static final int MONTH_BUTTON_INDEX = 2;
public static final int AGENDA_BUTTON_INDEX = 3;
+ public static final int TIMELY_BUTTON_INDEX = 4;
// The current selected event's time, used to calculate the date and day of the week
// for the buttons.
@@ -203,6 +205,11 @@
weekDay.setText(buildDayOfWeek());
date.setText(buildFullDate());
break;
+ case ViewType.TIMELY:
+ weekDay.setVisibility(View.VISIBLE);
+ weekDay.setText(buildDayOfWeek());
+ date.setText(buildFullDate());
+ break;
default:
v = null;
break;
@@ -232,6 +239,9 @@
case ViewType.AGENDA:
title.setText(mButtonNames [AGENDA_BUTTON_INDEX]);
break;
+ case ViewType.TIMELY:
+ title.setText(mButtonNames [TIMELY_BUTTON_INDEX]);
+ break;
default:
v = null;
break;
@@ -286,6 +296,12 @@
date.setText(buildMonthDayDate());
}
break;
+ case TIMELY_BUTTON_INDEX:
+ viewType.setText(mButtonNames [TIMELY_BUTTON_INDEX]);
+ if (mShowDate) {
+ date.setText(buildMonthDayDate());
+ }
+ break;
default:
v = convertView;
break;
diff --git a/src/com/android/calendar/TimelyFragment.java b/src/com/android/calendar/TimelyFragment.java
new file mode 100644
index 0000000..e3df494
--- /dev/null
+++ b/src/com/android/calendar/TimelyFragment.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.calendar;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.text.format.Time;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.android.calendar.CalendarController.EventInfo;
+import com.android.calendar.CalendarController.EventType;
+
+/**
+ * This is the base class for Day and Week Activities.
+ */
+public class TimelyFragment extends Fragment implements CalendarController.EventHandler {
+
+ ListView mList;
+ TimelyAdapter mAdapter;
+
+ public TimelyFragment() {
+ }
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View v = inflater.inflate(R.layout.timely_fragment, null);
+ ListView mList = (ListView)v.findViewById(R.id.timely_list);
+ if (mList != null) {
+ mAdapter = new TimelyAdapter(getActivity());
+ mList.setAdapter(mAdapter);
+ }
+ return v;
+ }
+
+
+ private void goTo(Time goToTime, boolean ignoreTime, boolean animateToday) {
+ }
+
+ @Override
+ public void eventsChanged() {
+ }
+
+ @Override
+ public void handleEvent(EventInfo msg) {
+ if (msg.eventType == EventType.GO_TO) {
+ goTo(msg.selectedTime, (msg.extraLong & CalendarController.EXTRA_GOTO_DATE) != 0,
+ (msg.extraLong & CalendarController.EXTRA_GOTO_TODAY) != 0);
+ } else if (msg.eventType == EventType.EVENTS_CHANGED) {
+ eventsChanged();
+ }
+ }
+
+ @Override
+ public long getSupportedEventTypes() {
+ return 0;
+ }
+
+ private class TimelyAdapter extends BaseAdapter {
+ private static final int EVENT_NUM = 10000;
+ int [] mTypes = new int [EVENT_NUM];
+ Context mContext;
+
+ public TimelyAdapter(Context c) {
+ mContext = c;
+ for (int i = 0; i < EVENT_NUM; i++) {
+ if (i % 30 == 0) {
+ mTypes[i] = 0; // month
+ } else {
+ if (Math.random() < 0.75) {
+ mTypes[i] = 1; // full day
+ } else {
+ mTypes[i] = 2; //empty day
+ }
+ }
+ }
+ }
+
+ @Override
+ public int getCount() {
+ return EVENT_NUM;
+ }
+
+ @Override
+ public Object getItem(int arg0) {
+ return null;
+ }
+
+ @Override
+ public long getItemId(int arg0) {
+ return arg0;
+ }
+
+ @Override
+ public View getView(int position, View v, ViewGroup arg2) {
+ TextView view;
+ if (v == null) {
+ view = new TextView(mContext);
+ } else {
+ view = (TextView) v;
+ }
+ if (mTypes[position] == 0) {
+ view.setTextColor(Color.RED);
+ view.setHeight(100);
+ view.setText(" Month Header");
+ view.setTypeface(Typeface.DEFAULT_BOLD);
+ view.setTextSize(30);
+ } else if (mTypes[position] == 1) {
+ view.setTextColor(Color.BLACK);
+ view.setHeight(250);
+ view.setText(" Day with events");
+ view.setTypeface(Typeface.DEFAULT);
+ view.setTextSize(30);
+ } else {
+ view.setTextColor(Color.GRAY);
+ view.setHeight(100);
+ view.setText(" Empty Day");
+ view.setTypeface(Typeface.DEFAULT);
+ view.setTextSize(30);
+ }
+ return view;
+ }
+ }
+}