From d41f0075a7d2ea826204e81fcec57d0aa57171a9 Mon Sep 17 00:00:00 2001 From: Nick Chalko Date: Wed, 26 Oct 2016 14:03:09 -0700 Subject: Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33 Change-Id: I873644d6d9d0110c981ef6075cb4019c16bbb94b --- common/res/values-af/strings.xml | 2 ++ common/res/values-am/strings.xml | 2 ++ common/res/values-ar/strings.xml | 2 ++ common/res/values-az-rAZ/strings.xml | 2 ++ common/res/values-bg/strings.xml | 2 ++ common/res/values-bn-rBD/strings.xml | 2 ++ common/res/values-ca/strings.xml | 2 ++ common/res/values-cs/strings.xml | 2 ++ common/res/values-da/strings.xml | 2 ++ common/res/values-de/strings.xml | 2 ++ common/res/values-el/strings.xml | 2 ++ common/res/values-en-rAU/strings.xml | 2 ++ common/res/values-en-rGB/strings.xml | 2 ++ common/res/values-en-rIN/strings.xml | 2 ++ common/res/values-es-rUS/strings.xml | 2 ++ common/res/values-es/strings.xml | 2 ++ common/res/values-et-rEE/strings.xml | 2 ++ common/res/values-eu-rES/strings.xml | 2 ++ common/res/values-fa/strings.xml | 2 ++ common/res/values-fi/strings.xml | 2 ++ common/res/values-fr-rCA/strings.xml | 2 ++ common/res/values-fr/strings.xml | 2 ++ common/res/values-gl-rES/strings.xml | 2 ++ common/res/values-hi/strings.xml | 2 ++ common/res/values-hr/strings.xml | 2 ++ common/res/values-hu/strings.xml | 2 ++ common/res/values-hy-rAM/strings.xml | 2 ++ common/res/values-in/strings.xml | 2 ++ common/res/values-is-rIS/strings.xml | 2 ++ common/res/values-it/strings.xml | 2 ++ common/res/values-iw/strings.xml | 2 ++ common/res/values-ja/strings.xml | 2 ++ common/res/values-ka-rGE/strings.xml | 2 ++ common/res/values-kk-rKZ/strings.xml | 2 ++ common/res/values-km-rKH/strings.xml | 2 ++ common/res/values-kn-rIN/strings.xml | 2 ++ common/res/values-ko/strings.xml | 2 ++ common/res/values-ky-rKG/strings.xml | 2 ++ common/res/values-lo-rLA/strings.xml | 2 ++ common/res/values-lt/strings.xml | 2 ++ common/res/values-lv/strings.xml | 2 ++ common/res/values-mk-rMK/strings.xml | 2 ++ common/res/values-ml-rIN/strings.xml | 2 ++ common/res/values-mn-rMN/strings.xml | 2 ++ common/res/values-mr-rIN/strings.xml | 2 ++ common/res/values-ms-rMY/strings.xml | 2 ++ common/res/values-my-rMM/strings.xml | 2 ++ common/res/values-nb/strings.xml | 2 ++ common/res/values-ne-rNP/strings.xml | 2 ++ common/res/values-nl/strings.xml | 2 ++ common/res/values-pl/strings.xml | 2 ++ common/res/values-pt-rPT/strings.xml | 2 ++ common/res/values-pt/strings.xml | 2 ++ common/res/values-ro/strings.xml | 2 ++ common/res/values-ru/strings.xml | 2 ++ common/res/values-si-rLK/strings.xml | 2 ++ common/res/values-sk/strings.xml | 2 ++ common/res/values-sl/strings.xml | 2 ++ common/res/values-sr/strings.xml | 2 ++ common/res/values-sv/strings.xml | 2 ++ common/res/values-sw/strings.xml | 2 ++ common/res/values-ta-rIN/strings.xml | 2 ++ common/res/values-te-rIN/strings.xml | 2 ++ common/res/values-th/strings.xml | 2 ++ common/res/values-tl/strings.xml | 2 ++ common/res/values-tr/strings.xml | 2 ++ common/res/values-uk/strings.xml | 2 ++ common/res/values-ur-rPK/strings.xml | 2 ++ common/res/values-uz-rUZ/strings.xml | 2 ++ common/res/values-vi/strings.xml | 2 ++ common/res/values-zh-rCN/strings.xml | 2 ++ common/res/values-zh-rHK/strings.xml | 2 ++ common/res/values-zh-rTW/strings.xml | 2 ++ common/res/values-zu/strings.xml | 2 ++ common/res/values/dimens.xml | 2 +- common/res/values/strings.xml | 4 +++ .../src/com/android/tv/common/CollectionUtils.java | 6 ++-- .../android/tv/common/feature/CommonFeatures.java | 9 +++--- .../tv/common/feature/SystemAppFeature.java | 34 ++++++++++++++++++++++ .../common/ui/setup/SetupGuidedStepFragment.java | 4 +-- 80 files changed, 195 insertions(+), 12 deletions(-) create mode 100644 common/src/com/android/tv/common/feature/SystemAppFeature.java (limited to 'common') diff --git a/common/res/values-af/strings.xml b/common/res/values-af/strings.xml index 0fdd75f4..7a114849 100644 --- a/common/res/values-af/strings.xml +++ b/common/res/values-af/strings.xml @@ -18,6 +18,8 @@ "Klaar" + "S.%1$s Ep.%2$s" + "Ep.%1$s" "S.%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S.%2$s: Ep. %3$s" diff --git a/common/res/values-am/strings.xml b/common/res/values-am/strings.xml index 22615319..45a1b7cb 100644 --- a/common/res/values-am/strings.xml +++ b/common/res/values-am/strings.xml @@ -18,6 +18,8 @@ "ተከናውኗል" + "ም%1$s፦ ክ.%2$s" + "ክ.%1$s" "ም%1$s፦ ክፍል %2$s %3$s" "ክፍል %1$s %2$s" "%1$s ም%2$s፦ ክፍል %3$s" diff --git a/common/res/values-ar/strings.xml b/common/res/values-ar/strings.xml index e3089d20..bedd137b 100644 --- a/common/res/values-ar/strings.xml +++ b/common/res/values-ar/strings.xml @@ -18,6 +18,8 @@ "تم" + "الموسم %1$s: الحلقة %2$s" + "الحلقة %1$s" "الموسم %1$s: الحلقة %2$s %3$s" "الحلقة %1$s %2$s" "%1$s الموسم رقم %2$s: الحلقة رقم %3$s" diff --git a/common/res/values-az-rAZ/strings.xml b/common/res/values-az-rAZ/strings.xml index 96f575ab..c844cd60 100644 --- a/common/res/values-az-rAZ/strings.xml +++ b/common/res/values-az-rAZ/strings.xml @@ -18,6 +18,8 @@ "Hazırdır" + "S%1$s: Ep.%2$s" + "Epizod%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-bg/strings.xml b/common/res/values-bg/strings.xml index ac61825e..264a1118 100644 --- a/common/res/values-bg/strings.xml +++ b/common/res/values-bg/strings.xml @@ -18,6 +18,8 @@ "Готово" + "Сезон %1$s: епизод %2$s" + "Епизод %1$s" "Сезон %1$s: Еп. %2$s – „%3$s“" "Еп. %1$s – „%2$s“" "„%1$s“, сезон %2$s, епизод %3$s" diff --git a/common/res/values-bn-rBD/strings.xml b/common/res/values-bn-rBD/strings.xml index d2ee5010..836a62a5 100644 --- a/common/res/values-bn-rBD/strings.xml +++ b/common/res/values-bn-rBD/strings.xml @@ -18,6 +18,8 @@ "সম্পন্ন" + "সিজন %1$s , পর্ব %2$s" + "পর্ব%1$s" "সিঃ%1$s: এপিঃ %2$s %3$s" "এপিঃ %1$s %2$s" "%1$s সিজিন%2$s: পর্ব %3$s" diff --git a/common/res/values-ca/strings.xml b/common/res/values-ca/strings.xml index e48259ab..6382648e 100644 --- a/common/res/values-ca/strings.xml +++ b/common/res/values-ca/strings.xml @@ -18,6 +18,8 @@ "Fet" + "Temporada %1$s, episodi %2$s" + "Episodi %1$s" "Temporada %1$s, episodi %2$s: %3$s" "Episodi %1$s: %2$s" "%1$s: temporada %2$s, episodi %3$s" diff --git a/common/res/values-cs/strings.xml b/common/res/values-cs/strings.xml index 2a64d6b2..0be8026c 100644 --- a/common/res/values-cs/strings.xml +++ b/common/res/values-cs/strings.xml @@ -18,6 +18,8 @@ "Hotovo" + "S%1$sE%2$s" + "E%1$s" "S%1$s: Ep. %2$s – %3$s" "Ep. %1$s – %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-da/strings.xml b/common/res/values-da/strings.xml index ac43906f..4685b818 100644 --- a/common/res/values-da/strings.xml +++ b/common/res/values-da/strings.xml @@ -18,6 +18,8 @@ "Udført" + "S. %1$s, afsn. %2$s" + "Afsn. %1$s" "S. %1$s: Afsnit %2$s, %3$s" "Afsnit %1$s %2$s" "%1$s S. %2$s: Afsn. %3$s" diff --git a/common/res/values-de/strings.xml b/common/res/values-de/strings.xml index 8f7d03f6..a487ff8a 100644 --- a/common/res/values-de/strings.xml +++ b/common/res/values-de/strings.xml @@ -18,6 +18,8 @@ "Fertig" + "S%1$s: F%2$s" + "Folge %1$s" "Staffel %1$s: Folge %2$s, %3$s" "Folge %1$s, %2$s" "%1$s, Staffel %2$s: Folge %3$s" diff --git a/common/res/values-el/strings.xml b/common/res/values-el/strings.xml index a825312b..dba894cb 100644 --- a/common/res/values-el/strings.xml +++ b/common/res/values-el/strings.xml @@ -18,6 +18,8 @@ "Τέλος" + "Σεζ. %1$s: Επ.%2$s" + "Επ.%1$s" "Σεζ.%1$s: Επ. %2$s %3$s" "Επ. %1$s %2$s" "%1$s Σεζόν%2$s: Επ. %3$s" diff --git a/common/res/values-en-rAU/strings.xml b/common/res/values-en-rAU/strings.xml index 7fc3313d..0ea27edc 100644 --- a/common/res/values-en-rAU/strings.xml +++ b/common/res/values-en-rAU/strings.xml @@ -18,6 +18,8 @@ "Finished" + "S%1$s: Ep.%2$s" + "Ep.%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-en-rGB/strings.xml b/common/res/values-en-rGB/strings.xml index 7fc3313d..0ea27edc 100644 --- a/common/res/values-en-rGB/strings.xml +++ b/common/res/values-en-rGB/strings.xml @@ -18,6 +18,8 @@ "Finished" + "S%1$s: Ep.%2$s" + "Ep.%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-en-rIN/strings.xml b/common/res/values-en-rIN/strings.xml index 7fc3313d..0ea27edc 100644 --- a/common/res/values-en-rIN/strings.xml +++ b/common/res/values-en-rIN/strings.xml @@ -18,6 +18,8 @@ "Finished" + "S%1$s: Ep.%2$s" + "Ep.%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-es-rUS/strings.xml b/common/res/values-es-rUS/strings.xml index 382e6cd5..87c881b8 100644 --- a/common/res/values-es-rUS/strings.xml +++ b/common/res/values-es-rUS/strings.xml @@ -18,6 +18,8 @@ "Listo" + "Temporada %1$s: episodio %2$s" + "Episodio %1$s" "Temporada %1$s, episodio %2$s: %3$s" "Episodio %1$s: %2$s" "%1$s: T%2$s, episodio %3$s" diff --git a/common/res/values-es/strings.xml b/common/res/values-es/strings.xml index 13b8fbae..32536d93 100644 --- a/common/res/values-es/strings.xml +++ b/common/res/values-es/strings.xml @@ -18,6 +18,8 @@ "Listo" + "Temporada %1$s: episodio %2$s" + "Episodio %1$s" "Temporada %1$s: episodio %2$s %3$s" "Episodio %1$s %2$s" "Temporada %2$s de %1$s, episodio %3$s" diff --git a/common/res/values-et-rEE/strings.xml b/common/res/values-et-rEE/strings.xml index 844f1e7e..9052178a 100644 --- a/common/res/values-et-rEE/strings.xml +++ b/common/res/values-et-rEE/strings.xml @@ -18,6 +18,8 @@ "Valmis" + "%1$s. hooaeg: %2$s. jagu" + "%1$s. jagu" "%1$s. hooaeg: %2$s. jagu – %3$s" "%1$s. jagu – %2$s" "%1$s – %2$s. hooaeg, %3$s. jagu" diff --git a/common/res/values-eu-rES/strings.xml b/common/res/values-eu-rES/strings.xml index 5341da33..d7ab52a8 100644 --- a/common/res/values-eu-rES/strings.xml +++ b/common/res/values-eu-rES/strings.xml @@ -18,6 +18,8 @@ "Eginda" + "%1$s. denboraldiko %2$s. atala" + "%1$s. atala" "%1$s. denboraldiko %2$s. atala: %3$s" "%1$s. atala: %2$s" "%1$s, %2$s. denboraldia: %3$s. atala" diff --git a/common/res/values-fa/strings.xml b/common/res/values-fa/strings.xml index efa46b6a..67e9c4e6 100644 --- a/common/res/values-fa/strings.xml +++ b/common/res/values-fa/strings.xml @@ -18,6 +18,8 @@ "تمام" + "فصل%1$s: قسمت%2$s" + "اپیزود %1$s" "ف.%1$s: ق. %2$s %3$s" "ق. %1$s %2$s" "%1$s فصل %2$s: قسمت %3$s" diff --git a/common/res/values-fi/strings.xml b/common/res/values-fi/strings.xml index af6c8578..8c6b99bf 100644 --- a/common/res/values-fi/strings.xml +++ b/common/res/values-fi/strings.xml @@ -18,6 +18,8 @@ "Valmis" + "Kausi %1$s, jakso %2$s" + "Jakso %1$s" "Kausi %1$s, jakso %2$s: %3$s" "Jakso %1$s: %2$s" "%1$s kausi %2$s, jakso %3$s" diff --git a/common/res/values-fr-rCA/strings.xml b/common/res/values-fr-rCA/strings.xml index 4bd4fa84..ed5678e2 100644 --- a/common/res/values-fr-rCA/strings.xml +++ b/common/res/values-fr-rCA/strings.xml @@ -18,6 +18,8 @@ "Terminé" + "Saison %1$s, ép. %2$s" + "Ép. %1$s" "Saison %1$s, épisode %2$s, « %3$s »" "Épisode %1$s, « %2$s »" "%1$s, saison %2$s : épisode %3$s" diff --git a/common/res/values-fr/strings.xml b/common/res/values-fr/strings.xml index 0decc4f2..b5b28104 100644 --- a/common/res/values-fr/strings.xml +++ b/common/res/values-fr/strings.xml @@ -18,6 +18,8 @@ "OK" + "Saison %1$s, épisode %2$s" + "Épisode %1$s" "S%1$s, ép. %2$s : %3$s" "Ép. %1$s : %2$s" "%1$s – S %2$s, ép. %3$s" diff --git a/common/res/values-gl-rES/strings.xml b/common/res/values-gl-rES/strings.xml index 6e24457e..356ac562 100644 --- a/common/res/values-gl-rES/strings.xml +++ b/common/res/values-gl-rES/strings.xml @@ -18,6 +18,8 @@ "Feito" + "T %1$s: Ep. %2$s" + "Ep. %1$s" "T%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s T%2$s: ep. %3$s" diff --git a/common/res/values-hi/strings.xml b/common/res/values-hi/strings.xml index f5f33838..27cae84d 100644 --- a/common/res/values-hi/strings.xml +++ b/common/res/values-hi/strings.xml @@ -18,6 +18,8 @@ "हो गया" + "सीज़न%1$s: एपिसोड%2$s" + "एपिसोड %1$s" "सीज़न%1$s: एपिसोड %2$s %3$s" "एपिसोड %1$s %2$s" "%1$s सीज़न%2$s: एपिसोड %3$s" diff --git a/common/res/values-hr/strings.xml b/common/res/values-hr/strings.xml index 5bff1614..66127784 100644 --- a/common/res/values-hr/strings.xml +++ b/common/res/values-hr/strings.xml @@ -18,6 +18,8 @@ "Gotovo" + "S. %1$s: Ep. %2$s" + "Ep. %1$s" "S. %1$s: ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s %2$s. s.: %3$s. ep." diff --git a/common/res/values-hu/strings.xml b/common/res/values-hu/strings.xml index 645aadd5..138ad857 100644 --- a/common/res/values-hu/strings.xml +++ b/common/res/values-hu/strings.xml @@ -18,6 +18,8 @@ "Kész" + "%1$s. évad, %2$s. rész" + "%1$s. rész" "%1$s. évad, %2$s. rész: %3$s" "%1$s. rész: %2$s" "%1$s – %2$s. évad, %3$s. epizód" diff --git a/common/res/values-hy-rAM/strings.xml b/common/res/values-hy-rAM/strings.xml index 2fb2dc80..aaa7470f 100644 --- a/common/res/values-hy-rAM/strings.xml +++ b/common/res/values-hy-rAM/strings.xml @@ -18,6 +18,8 @@ "Պատրաստ է" + "Ե %1$s՝ դրվ. %2$s" + "Դրվ. %1$s" "Ե%1$s՝ դրվ. %2$s %3$s" "Դրվ. %1$s %2$s" "%1$s Ե%2$s՝ Դրվ. %3$s" diff --git a/common/res/values-in/strings.xml b/common/res/values-in/strings.xml index 0dab629a..da4b8203 100644 --- a/common/res/values-in/strings.xml +++ b/common/res/values-in/strings.xml @@ -18,6 +18,8 @@ "Selesai" + "S%1$s: Ep.%2$s" + "Ep.%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-is-rIS/strings.xml b/common/res/values-is-rIS/strings.xml index 9e8115cc..47529403 100644 --- a/common/res/values-is-rIS/strings.xml +++ b/common/res/values-is-rIS/strings.xml @@ -18,6 +18,8 @@ "Lokið" + "S.%1$s: Þ.%2$s" + "%1$s. þáttur" "S.%1$s: Þ. %2$s %3$s" "Þ. %1$s %2$s" "%1$s S.%2$s: Þ. %3$s" diff --git a/common/res/values-it/strings.xml b/common/res/values-it/strings.xml index e1329395..f61e02f7 100644 --- a/common/res/values-it/strings.xml +++ b/common/res/values-it/strings.xml @@ -18,6 +18,8 @@ "Fine" + "Stagione %1$s, puntata %2$s" + "Ep. %1$s" "Stag. %1$s: punt. %2$s %3$s" "Punt. %1$s %2$s" "%1$s Stag. %2$s: punt. %3$s" diff --git a/common/res/values-iw/strings.xml b/common/res/values-iw/strings.xml index fded886c..7ad220ad 100644 --- a/common/res/values-iw/strings.xml +++ b/common/res/values-iw/strings.xml @@ -18,6 +18,8 @@ "סיום" + "עונה %1$s: פרק %2$s" + "פרק %1$s" "עונה%1$s: פרק %2$s %3$s" "פרק %1$s %2$s" "%1$s עונה %2$s: פרק %3$s" diff --git a/common/res/values-ja/strings.xml b/common/res/values-ja/strings.xml index 65493625..682fd0d8 100644 --- a/common/res/values-ja/strings.xml +++ b/common/res/values-ja/strings.xml @@ -18,6 +18,8 @@ "完了" + "シーズン %1$s: エピソード %2$s" + "エピソード %1$s" "シーズン %1$s: エピソード %2$s「%3$s」" "エピソード %1$s「%2$s」" "%1$s、シーズン %2$s: エピソード %3$s" diff --git a/common/res/values-ka-rGE/strings.xml b/common/res/values-ka-rGE/strings.xml index ff21cf86..3c7062ff 100644 --- a/common/res/values-ka-rGE/strings.xml +++ b/common/res/values-ka-rGE/strings.xml @@ -18,6 +18,8 @@ "მზადაა" + "სეზ. %1$s: ეპ. %2$s" + "ეპ. %1$s" "სეზ. %1$s, ეპ. %2$s — %3$s" "ეპ. %1$s — %2$s" "%1$s: სეზ. %2$s, ეპ. %3$s" diff --git a/common/res/values-kk-rKZ/strings.xml b/common/res/values-kk-rKZ/strings.xml index 98dd36b5..12de7d34 100644 --- a/common/res/values-kk-rKZ/strings.xml +++ b/common/res/values-kk-rKZ/strings.xml @@ -18,6 +18,8 @@ "Орындалды" + "%1$s-маусым, %2$s-серия" + "%1$s-серия" "%1$s-маусым: %2$s-серия, \"%3$s\"" "%1$s-серия, \"%2$s\"" "%1$s, %2$s-маусым, %3$s-серия" diff --git a/common/res/values-km-rKH/strings.xml b/common/res/values-km-rKH/strings.xml index 59e235ab..b8353897 100644 --- a/common/res/values-km-rKH/strings.xml +++ b/common/res/values-km-rKH/strings.xml @@ -18,6 +18,8 @@ "រួចរាល់" + "រដូវកាល%1$s៖ ភាគ%2$s" + "ភាគ៖ %1$s" "រដូវកាលទី %1$s៖ វគ្គ %2$s %3$s" "វគ្គ %1$s %2$s" "%1$s រដូវ%2$s៖ ភាគ %3$s" diff --git a/common/res/values-kn-rIN/strings.xml b/common/res/values-kn-rIN/strings.xml index 2c43735d..7cb096b7 100644 --- a/common/res/values-kn-rIN/strings.xml +++ b/common/res/values-kn-rIN/strings.xml @@ -18,6 +18,8 @@ "ಮುಗಿದಿದೆ" + "ಕಾಲ%1$sಭಾಗ%2$s" + "ಭಾಗ%1$s" "ಸೀ%1$s: ಸಂ. %2$s %3$s" "ಸಂ. %1$s %2$s" "%1$s ಸೀ%2$s: ಸಂ. %3$s" diff --git a/common/res/values-ko/strings.xml b/common/res/values-ko/strings.xml index 5c4f190b..923831f3 100644 --- a/common/res/values-ko/strings.xml +++ b/common/res/values-ko/strings.xml @@ -18,6 +18,8 @@ "완료" + "시즌 %1$s: 에피소드 %2$s" + "에피소드 %1$s" "시즌 %1$s: 에피소드 %2$s \'%3$s\'" "에피소드 %1$s \'%2$s\'" "%1$s 시즌 %2$s: 에피소드 %3$s" diff --git a/common/res/values-ky-rKG/strings.xml b/common/res/values-ky-rKG/strings.xml index 00d7a018..8bdfadde 100644 --- a/common/res/values-ky-rKG/strings.xml +++ b/common/res/values-ky-rKG/strings.xml @@ -18,6 +18,8 @@ "Бүттү" + "%1$s-мезгил: %2$s-серия" + "%1$s-серия" "С%1$s: %3$s %2$s-серия" "%2$s %1$s-серия" "%1$s S%2$s: %3$s-эпизод" diff --git a/common/res/values-lo-rLA/strings.xml b/common/res/values-lo-rLA/strings.xml index 25c0e5b5..a6dad515 100644 --- a/common/res/values-lo-rLA/strings.xml +++ b/common/res/values-lo-rLA/strings.xml @@ -18,6 +18,8 @@ "ສຳເລັດແລ້ວ" + "S%1$s: Ep.%2$s" + "Ep.%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-lt/strings.xml b/common/res/values-lt/strings.xml index 3354f769..6d6c0ee8 100644 --- a/common/res/values-lt/strings.xml +++ b/common/res/values-lt/strings.xml @@ -18,6 +18,8 @@ "Atlikta" + "%1$s sezonas: %2$s serija" + "%1$s serija" "%1$s sezonas: %2$s serija „%3$s“" "%1$s serija „%2$s“" "Programos „%1$s“ %2$s sezonas: %3$s serija" diff --git a/common/res/values-lv/strings.xml b/common/res/values-lv/strings.xml index 46c8aa7e..f0366a48 100644 --- a/common/res/values-lv/strings.xml +++ b/common/res/values-lv/strings.xml @@ -18,6 +18,8 @@ "Gatavs" + "%1$s. sez., %2$s. sēr." + "%1$s. sēr." "%1$s. sezona: %2$s. sērija “%3$s”" "%1$s. sērija “%2$s”" "%1$s: %2$s. sezona, %3$s. sērija" diff --git a/common/res/values-mk-rMK/strings.xml b/common/res/values-mk-rMK/strings.xml index 5853f362..73045d3d 100644 --- a/common/res/values-mk-rMK/strings.xml +++ b/common/res/values-mk-rMK/strings.xml @@ -18,6 +18,8 @@ "Готово" + "Сез.%1$s: Еп.%2$s" + "Еп.%1$s" "Сез. %1$s: Еп. %2$s %3$s" "Еп. %1$s %2$s" "%1$s Сез.%2$s: Еп.. %3$s" diff --git a/common/res/values-ml-rIN/strings.xml b/common/res/values-ml-rIN/strings.xml index 68f8b885..07727684 100644 --- a/common/res/values-ml-rIN/strings.xml +++ b/common/res/values-ml-rIN/strings.xml @@ -18,6 +18,8 @@ "പൂർത്തിയായി" + "സീസൺ%1$s: എപ്പി.%2$s" + "എപ്പി.%1$s" "സീസൺ%1$s: എപ്പിസോഡ് %2$s %3$s" "എപ്പിസോഡ് %1$s %2$s" "%1$s സീരിയൽ%2$s: എപ്പിസോഡ് %3$s" diff --git a/common/res/values-mn-rMN/strings.xml b/common/res/values-mn-rMN/strings.xml index 5ed326d8..ff1552e0 100644 --- a/common/res/values-mn-rMN/strings.xml +++ b/common/res/values-mn-rMN/strings.xml @@ -18,6 +18,8 @@ "Дууссан" + "Бүлэг%1$s: Цуврал.%2$s" + "Анги.%1$s" "Бүлэг%1$s: Анги. %2$s %3$s" "Анги. %1$s %2$s" "%1$s Бүлэг%2$s: Анги. %3$s" diff --git a/common/res/values-mr-rIN/strings.xml b/common/res/values-mr-rIN/strings.xml index 8cda69f4..adc669ae 100644 --- a/common/res/values-mr-rIN/strings.xml +++ b/common/res/values-mr-rIN/strings.xml @@ -18,6 +18,8 @@ "पूर्ण झाले" + "हंगाम%1$s: भाग%2$s" + "भाग%1$s" "हंगाम%1$s: भाग. %2$s %3$s" "भाग. %1$s %2$s" "%1$s सत्र%2$s: भाग %3$s" diff --git a/common/res/values-ms-rMY/strings.xml b/common/res/values-ms-rMY/strings.xml index d815b47d..06eb6173 100644 --- a/common/res/values-ms-rMY/strings.xml +++ b/common/res/values-ms-rMY/strings.xml @@ -18,6 +18,8 @@ "Selesai" + "M%1$s: Ep.%2$s" + "Ep.%1$s" "M%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-my-rMM/strings.xml b/common/res/values-my-rMM/strings.xml index 605b5e93..977c4315 100644 --- a/common/res/values-my-rMM/strings.xml +++ b/common/res/values-my-rMM/strings.xml @@ -18,6 +18,8 @@ "ပြီးပါပြီ" + "အတွဲ%1$s− အပိုင်း%2$s" + "အပိုင်း %1$s" "အတွဲ%1$s− အပိုင်း %2$s %3$s" "အပိုင်း %1$s %2$s" "%1$s အတွဲ%2$s− အပိုင်း %3$s" diff --git a/common/res/values-nb/strings.xml b/common/res/values-nb/strings.xml index aaf3e04c..8344a76b 100644 --- a/common/res/values-nb/strings.xml +++ b/common/res/values-nb/strings.xml @@ -18,6 +18,8 @@ "Ferdig" + "Sesong %1$s episode %2$s" + "Episode %1$s" "Sesong %1$s: episode %2$s – %3$s" "Episode %1$s – %2$s" "%1$s Sesong %2$s: Episode %3$s" diff --git a/common/res/values-ne-rNP/strings.xml b/common/res/values-ne-rNP/strings.xml index 88445690..4f3d24c1 100644 --- a/common/res/values-ne-rNP/strings.xml +++ b/common/res/values-ne-rNP/strings.xml @@ -18,6 +18,8 @@ "सम्पन्न भयो" + "सिजन %1$s: एपिसोड %2$s" + "एपिसोड %1$s" "सिजन %1$s: एपिसोड %2$s %3$s" "एपिसोड %1$s %2$s" "%1$s सिजन %2$s: एपिसोड %3$s" diff --git a/common/res/values-nl/strings.xml b/common/res/values-nl/strings.xml index fc190cc4..4e5a1011 100644 --- a/common/res/values-nl/strings.xml +++ b/common/res/values-nl/strings.xml @@ -18,6 +18,8 @@ "Gereed" + "S %1$s afl. %2$s" + "Afl. %1$s" "S. %1$s: afl. %2$s %3$s" "Afl. %1$s %2$s" "%1$s S%2$s: Afl. %3$s" diff --git a/common/res/values-pl/strings.xml b/common/res/values-pl/strings.xml index 073d9b24..5161e3ba 100644 --- a/common/res/values-pl/strings.xml +++ b/common/res/values-pl/strings.xml @@ -18,6 +18,8 @@ "Gotowe" + "Sez. %1$s: odc. %2$s" + "Odc. %1$s" "Sez. %1$s, odc. %2$s: %3$s" "Odc. %1$s: %2$s" "%1$s – sez. %2$s, odc. %3$s" diff --git a/common/res/values-pt-rPT/strings.xml b/common/res/values-pt-rPT/strings.xml index 3344fa98..badaae27 100644 --- a/common/res/values-pt-rPT/strings.xml +++ b/common/res/values-pt-rPT/strings.xml @@ -18,6 +18,8 @@ "Concluído" + "T. %1$s: ep. %2$s" + "Ep. %1$s" "T%1$s: ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s T%2$s: ep. %3$s" diff --git a/common/res/values-pt/strings.xml b/common/res/values-pt/strings.xml index b38019c9..0fc3e097 100644 --- a/common/res/values-pt/strings.xml +++ b/common/res/values-pt/strings.xml @@ -18,6 +18,8 @@ "Concluído" + "T%1$s: Ep.%2$s" + "Ep.%1$s" "T%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s T%2$s: Ep. %3$s" diff --git a/common/res/values-ro/strings.xml b/common/res/values-ro/strings.xml index 1885733e..ae6fc497 100644 --- a/common/res/values-ro/strings.xml +++ b/common/res/values-ro/strings.xml @@ -18,6 +18,8 @@ "Terminat" + "Sezonul %1$s, episodul %2$s" + "Episodul %1$s" "Sezonul %1$s, episodul %2$s: %3$s" "Episodul %1$s: %2$s" "%1$s, sezonul %2$s, episodul %3$s" diff --git a/common/res/values-ru/strings.xml b/common/res/values-ru/strings.xml index d107c101..53c341aa 100644 --- a/common/res/values-ru/strings.xml +++ b/common/res/values-ru/strings.xml @@ -18,6 +18,8 @@ "Готово" + "Сезон %1$s, серия %2$s" + "Серия %1$s" "Сезон %1$s: серия %2$s, \"%3$s\"" "Серия %1$s, \"%2$s\"" "%1$s, сезон %2$s, серия %3$s" diff --git a/common/res/values-si-rLK/strings.xml b/common/res/values-si-rLK/strings.xml index 73065f78..85fc1f94 100644 --- a/common/res/values-si-rLK/strings.xml +++ b/common/res/values-si-rLK/strings.xml @@ -18,6 +18,8 @@ "නිමයි" + "වාරය%1$sකථාංගය%2$s" + "කථාංගය %1$s" "වාරය%1$s: කථාංගය %2$s %3$s" "කථාංගය %1$s %2$s" "%1$s වාරය%2$s: කථාංගය. %3$s" diff --git a/common/res/values-sk/strings.xml b/common/res/values-sk/strings.xml index b8185b98..1d1a673f 100644 --- a/common/res/values-sk/strings.xml +++ b/common/res/values-sk/strings.xml @@ -18,6 +18,8 @@ "Hotovo" + "S%1$s: ep.%2$s" + "E%1$s" "S %1$s: ep. %2$s – %3$s" "Ep. %1$s – %2$s" "%1$s %2$s. sezóna: %3$s. epizóda" diff --git a/common/res/values-sl/strings.xml b/common/res/values-sl/strings.xml index 70419855..26ec614d 100644 --- a/common/res/values-sl/strings.xml +++ b/common/res/values-sl/strings.xml @@ -18,6 +18,8 @@ "Končano" + "%1$s. sezona: %2$s. epizoda" + "%1$s. epizoda" "%1$s. sezona – %2$s. epizoda: %3$s" "%1$s. epizoda: %2$s" "%1$s – %2$s. sezona: %3$s. epizoda" diff --git a/common/res/values-sr/strings.xml b/common/res/values-sr/strings.xml index 9c2c20e0..ef7f9ee5 100644 --- a/common/res/values-sr/strings.xml +++ b/common/res/values-sr/strings.xml @@ -18,6 +18,8 @@ "Готово" + "Серијал: %1$s: Епизода: %2$s" + "%1$s. епизода" "%1$s. серијал: %2$s. епизода, %3$s" "%1$s. епизода, %2$s" "%1$s %2$s. серијал: %3$s. епизода" diff --git a/common/res/values-sv/strings.xml b/common/res/values-sv/strings.xml index c556437f..9911a0de 100644 --- a/common/res/values-sv/strings.xml +++ b/common/res/values-sv/strings.xml @@ -18,6 +18,8 @@ "Klar" + "Säsong %1$s, avsnitt %2$s" + "Avsnitt %1$s" "Säsong %1$s: avsnitt %2$s – %3$s" "Avsnitt %1$s – %2$s" "%1$s Säsong%2$s: avsnitt %3$s" diff --git a/common/res/values-sw/strings.xml b/common/res/values-sw/strings.xml index 78d58979..7d44cedf 100644 --- a/common/res/values-sw/strings.xml +++ b/common/res/values-sw/strings.xml @@ -18,6 +18,8 @@ "Nimemaliza" + "Msimu wa %1$s: Kipindi cha %2$s" + "Kipindi cha %1$s" "Msimu wa %1$s: Kipindi cha %2$s %3$s" "Kipindi cha %1$s %2$s" "%1$sMsimu wa %2$s: Kipindi cha %3$s" diff --git a/common/res/values-ta-rIN/strings.xml b/common/res/values-ta-rIN/strings.xml index aea006c7..bc2eed62 100644 --- a/common/res/values-ta-rIN/strings.xml +++ b/common/res/values-ta-rIN/strings.xml @@ -18,6 +18,8 @@ "முடிந்தது" + "சீ%1$s: எபி.%2$s" + "எபி.%1$s" "சீ%1$s: எபி. %2$s %3$s" "எபி. %1$s %2$s" "%1$s சீ%2$s: எபி. %3$s" diff --git a/common/res/values-te-rIN/strings.xml b/common/res/values-te-rIN/strings.xml index 92562718..80df229d 100644 --- a/common/res/values-te-rIN/strings.xml +++ b/common/res/values-te-rIN/strings.xml @@ -18,6 +18,8 @@ "పూర్తయింది" + "సీ%1$s: ఎపి.%2$s" + "ఎపి.%1$s" "సీ%1$s: ఎపి. %2$s %3$s" "ఎపి. %1$s %2$s" "%1$s సీ%2$s: ఎపి. %3$s" diff --git a/common/res/values-th/strings.xml b/common/res/values-th/strings.xml index 7ff4baab..5ff9f1ff 100644 --- a/common/res/values-th/strings.xml +++ b/common/res/values-th/strings.xml @@ -18,6 +18,8 @@ "เสร็จสิ้น" + "ซีซัน %1$s: ตอนที่ %2$s" + "ตอนที่ %1$s" "ซีซัน %1$s: ตอนที่ %2$s %3$s" "ตอนที่ %1$s %2$s" "%1$s ซีซัน %2$s: ตอน %3$s" diff --git a/common/res/values-tl/strings.xml b/common/res/values-tl/strings.xml index b391fe22..e6b8bbbc 100644 --- a/common/res/values-tl/strings.xml +++ b/common/res/values-tl/strings.xml @@ -18,6 +18,8 @@ "Tapos Na" + "S%1$s: Ep.%2$s" + "Ep.%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values-tr/strings.xml b/common/res/values-tr/strings.xml index a7ec0bc0..c25c834f 100644 --- a/common/res/values-tr/strings.xml +++ b/common/res/values-tr/strings.xml @@ -18,6 +18,8 @@ "Bitti" + "S%1$s: Böl.%2$s" + "Böl.%1$s" "S%1$s: %2$s. Bölüm %3$s" "%1$s. Bölüm %2$s" "%1$s %2$s.S: %3$s. Böl." diff --git a/common/res/values-uk/strings.xml b/common/res/values-uk/strings.xml index d754ea4d..9b67cf4a 100644 --- a/common/res/values-uk/strings.xml +++ b/common/res/values-uk/strings.xml @@ -18,6 +18,8 @@ "Готово" + "Сезон %1$s: серія %2$s" + "Серія %1$s" "Сезон %1$s: серія %2$s \"%3$s\"" "Серія %1$s \"%2$s\"" "\"%1$s\": сезон %2$s, серія %3$s" diff --git a/common/res/values-ur-rPK/strings.xml b/common/res/values-ur-rPK/strings.xml index a6bd6a62..b04fb3c3 100644 --- a/common/res/values-ur-rPK/strings.xml +++ b/common/res/values-ur-rPK/strings.xml @@ -18,6 +18,8 @@ "ہو گیا" + "سیزن%1$s: ایپی سوڈ۔%2$s" + "ایپی سوڈ %1$s" "سیزن %1$s: ایپی سوڈ %2$s %3$s" "ایپی سوڈ %1$s %2$s" "%1$s سیزن %2$s: ایپی سوڈ %3$s" diff --git a/common/res/values-uz-rUZ/strings.xml b/common/res/values-uz-rUZ/strings.xml index 430167d0..ffa1cf9c 100644 --- a/common/res/values-uz-rUZ/strings.xml +++ b/common/res/values-uz-rUZ/strings.xml @@ -18,6 +18,8 @@ "Tayyor" + "%1$s-fasl: %2$s-qism" + "%1$s-qism" "%1$s-fasl: %2$s-qism – “%3$s”" "%1$s-qism – “%2$s”" "%1$s, %2$s-fasl %3$s-qism" diff --git a/common/res/values-vi/strings.xml b/common/res/values-vi/strings.xml index 72c64cbc..2852bb10 100644 --- a/common/res/values-vi/strings.xml +++ b/common/res/values-vi/strings.xml @@ -18,6 +18,8 @@ "Xong" + "Phần%1$s: Tập%2$s" + "Tập%1$s" "Phần %1$s: Tập %2$s %3$s" "Tập %1$s %2$s" "%1$s P%2$s: Tập %3$s" diff --git a/common/res/values-zh-rCN/strings.xml b/common/res/values-zh-rCN/strings.xml index f412fa03..25e13379 100644 --- a/common/res/values-zh-rCN/strings.xml +++ b/common/res/values-zh-rCN/strings.xml @@ -18,6 +18,8 @@ "完成" + "第 %1$s 季：第 %2$s 集" + "第 %1$s 集" "第 %1$s 季第 %2$s 集：%3$s" "第 %1$s 集：%2$s" "《%1$s》第 %2$s 季：第 %3$s 集" diff --git a/common/res/values-zh-rHK/strings.xml b/common/res/values-zh-rHK/strings.xml index 91611145..ed323c6a 100644 --- a/common/res/values-zh-rHK/strings.xml +++ b/common/res/values-zh-rHK/strings.xml @@ -18,6 +18,8 @@ "完成" + "第 %1$s 季：第 %2$s 集" + "第 %1$s 集" "第 %1$s 季：第 %2$s 集 %3$s" "第 %1$s 集 %2$s" "《%1$s》第 %2$s 季：第 %3$s 集" diff --git a/common/res/values-zh-rTW/strings.xml b/common/res/values-zh-rTW/strings.xml index f412fa03..25e13379 100644 --- a/common/res/values-zh-rTW/strings.xml +++ b/common/res/values-zh-rTW/strings.xml @@ -18,6 +18,8 @@ "完成" + "第 %1$s 季：第 %2$s 集" + "第 %1$s 集" "第 %1$s 季第 %2$s 集：%3$s" "第 %1$s 集：%2$s" "《%1$s》第 %2$s 季：第 %3$s 集" diff --git a/common/res/values-zu/strings.xml b/common/res/values-zu/strings.xml index 6f8a6f7f..4574ac01 100644 --- a/common/res/values-zu/strings.xml +++ b/common/res/values-zu/strings.xml @@ -18,6 +18,8 @@ "Kwenziwe" + "S%1$s: Ep.%2$s" + "Ep.%1$s" "S%1$s: Ep. %2$s %3$s" "Ep. %1$s %2$s" "%1$s S%2$s: Ep. %3$s" diff --git a/common/res/values/dimens.xml b/common/res/values/dimens.xml index 4d8286cd..9d6e0e67 100644 --- a/common/res/values/dimens.xml +++ b/common/res/values/dimens.xml @@ -26,7 +26,7 @@ 138dp 24dp 24dp - 190dp + 220dp 40dp 40dp 12dp diff --git a/common/res/values/strings.xml b/common/res/values/strings.xml index 7c14ce39..e5b9b625 100644 --- a/common/res/values/strings.xml +++ b/common/res/values/strings.xml @@ -17,6 +17,10 @@ Done + + S%1$s: Ep.%2$s + + Ep.%1$s S%1$s: Ep. %2$s %3$s diff --git a/common/src/com/android/tv/common/CollectionUtils.java b/common/src/com/android/tv/common/CollectionUtils.java index 294159c7..300ad8f2 100644 --- a/common/src/com/android/tv/common/CollectionUtils.java +++ b/common/src/com/android/tv/common/CollectionUtils.java @@ -60,7 +60,7 @@ public class CollectionUtils { Collections.sort(result, comparator); List resultToAdd = new ArrayList<>(); for (T toAdd : toAdds) { - if (Collections.binarySearch(result, toAdd, comparator) != 0) { + if (Collections.binarySearch(result, toAdd, comparator) < 0) { resultToAdd.add(toAdd); } } @@ -77,7 +77,7 @@ public class CollectionUtils { Collections.sort(result, comparator); for (T toSubtract : toSubtracts) { int index = Collections.binarySearch(result, toSubtract, comparator); - if (index != -1) { + if (index >= 0) { result.remove(index); } } @@ -92,7 +92,7 @@ public class CollectionUtils { List contains = new ArrayList<>(c1); Collections.sort(contains, comparator); for (T iterate : c2) { - if (Collections.binarySearch(contains, iterate, comparator) != -1) { + if (Collections.binarySearch(contains, iterate, comparator) >= 0) { return true; } } diff --git a/common/src/com/android/tv/common/feature/CommonFeatures.java b/common/src/com/android/tv/common/feature/CommonFeatures.java index dfaa527c..d47aa603 100644 --- a/common/src/com/android/tv/common/feature/CommonFeatures.java +++ b/common/src/com/android/tv/common/feature/CommonFeatures.java @@ -16,6 +16,7 @@ package com.android.tv.common.feature; +import static com.android.tv.common.feature.FeatureUtils.AND; import static com.android.tv.common.feature.FeatureUtils.OR; import static com.android.tv.common.feature.TestableFeature.createTestableFeature; @@ -30,12 +31,10 @@ public class CommonFeatures { * *

See go/atv-dvr-onepager * - * DVR API is introduced in N. - * - * STOPSHIP: Double-check of DVR is a part of the release before launching. + * DVR API is introduced in N, it only works when app runs as a system app. */ - public static final TestableFeature DVR = - createTestableFeature(OR(Sdk.N_PRE_2_OR_HIGHER, Sdk.AT_LEAST_N)); + public static final TestableFeature DVR = createTestableFeature( + AND(OR(Sdk.N_PRE_2_OR_HIGHER, Sdk.AT_LEAST_N), SystemAppFeature.SYSTEM_APP_FEATURE)); /** * ENABLE_RECORDING_REGARDLESS_OF_STORAGE_STATUS diff --git a/common/src/com/android/tv/common/feature/SystemAppFeature.java b/common/src/com/android/tv/common/feature/SystemAppFeature.java new file mode 100644 index 00000000..79fd32f3 --- /dev/null +++ b/common/src/com/android/tv/common/feature/SystemAppFeature.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2016 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.tv.common.feature; + +import android.content.Context; +import android.content.pm.ApplicationInfo; + +/** + * A feature that is for system App. + */ +public final class SystemAppFeature implements Feature { + public static final Feature SYSTEM_APP_FEATURE = new SystemAppFeature(); + + private SystemAppFeature() { } + + @Override + public boolean isEnabled(Context context) { + return (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) != 0; + } +} diff --git a/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java b/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java index 3eb9ebf2..bcaefec9 100644 --- a/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java +++ b/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java @@ -57,9 +57,7 @@ public abstract class SetupGuidedStepFragment extends GuidedStepFragment { R.dimen.setup_done_button_container_width); // Guided actions list View list = view.findViewById(R.id.guidedactions_list); - View list2 = view.findViewById(R.id.guidedactions_list2); - MarginLayoutParams marginLayoutParams = (MarginLayoutParams) view.findViewById( - R.id.guidedactions_list).getLayoutParams(); + MarginLayoutParams marginLayoutParams = (MarginLayoutParams) list.getLayoutParams(); // Use content view to check layout direction while view is being created. if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_LTR) { -- cgit v1.2.3