diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java index d627cce1f3..95192f6f74 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java @@ -16,8 +16,6 @@ package com.google.android.exoplayer2.demo; import android.app.Notification; -import android.app.PendingIntent; -import android.content.Intent; import android.util.Pair; import com.google.android.exoplayer2.offline.DownloadManager; import com.google.android.exoplayer2.offline.DownloadManager.TaskState; @@ -83,7 +81,7 @@ public class DemoDownloadService extends DownloadService { /* context= */ this, R.drawable.exo_controls_play, CHANNEL_ID, - getContentIntent(), + /* contentIntent= */ null, /* message= */ null); } @@ -96,7 +94,7 @@ public class DemoDownloadService extends DownloadService { /* context= */ this, R.drawable.exo_controls_play, CHANNEL_ID, - getContentIntent(), + /* contentIntent= */ null, taskState.action.data, new ErrorMessageProvider() { @Override @@ -106,10 +104,4 @@ public class DemoDownloadService extends DownloadService { }); NotificationUtil.setNotification(/* context= */ this, notificationId, downloadNotification); } - - private PendingIntent getContentIntent() { - Intent intent = new Intent(/* packageContext= */ this, DownloadActivity.class); - return PendingIntent.getActivity( - /* context= */ this, /* requestCode= */ 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); - } } diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/library/ui/src/main/res/values-b+sr+Latn/strings.xml index 09fee5e721..4848f4c087 100644 --- a/library/ui/src/main/res/values-b+sr+Latn/strings.xml +++ b/library/ui/src/main/res/values-b+sr+Latn/strings.xml @@ -23,13 +23,13 @@ Tekst Nijedna Automatski - Unknown + Nepoznato %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Zvučni sistem + Zvučni sistem 5.1 + Zvučni sistem 7.1 + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-be/strings.xml b/library/ui/src/main/res/values-be/strings.xml index 843f8c47b7..0fae6e7190 100644 --- a/library/ui/src/main/res/values-be/strings.xml +++ b/library/ui/src/main/res/values-be/strings.xml @@ -23,13 +23,13 @@ Тэкст Няма Аўтаматычна - Unknown + Невядома %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Мона + Стэрэа + Аб\'ёмны гук + Аб\'ёмны гук 5.1 + Аб\'ёмны гук 7.1 + %1$.2f Мбіт/с %1$s, %2$s diff --git a/library/ui/src/main/res/values-ca/strings.xml b/library/ui/src/main/res/values-ca/strings.xml index 11483e5e79..142647521c 100644 --- a/library/ui/src/main/res/values-ca/strings.xml +++ b/library/ui/src/main/res/values-ca/strings.xml @@ -23,13 +23,13 @@ Text Cap Automàtica - Unknown - %1$d × %2$d + Desconegut + %1$d × %2$d Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Estèreo + So envoltant + So envoltant 5.1 + So envoltant 7.1 + %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml index 2cd8f79b98..996c3677ab 100644 --- a/library/ui/src/main/res/values-cs/strings.xml +++ b/library/ui/src/main/res/values-cs/strings.xml @@ -23,13 +23,13 @@ SMS Žádné Automaticky - Unknown - %1$d × %2$d + Neznámé + %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Prostorový zvuk + Prostorový zvuk 5.1 + Prostorový zvuk 7.1 + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-da/strings.xml b/library/ui/src/main/res/values-da/strings.xml index 39fca5a9cd..e8277ff535 100644 --- a/library/ui/src/main/res/values-da/strings.xml +++ b/library/ui/src/main/res/values-da/strings.xml @@ -23,13 +23,13 @@ Undertekst Ingen Automatisk - Unknown + Ukendt %1$d × %2$d Mono Stereo - Surround sound + Surroundsound 5.1 surround sound - 7.1 surround sound + 7.1 surroundsound %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml index f437b60e90..abcad84a5d 100644 --- a/library/ui/src/main/res/values-de/strings.xml +++ b/library/ui/src/main/res/values-de/strings.xml @@ -23,13 +23,13 @@ Text Keiner Automatisch - Unknown - %1$d × %2$d + Unbekannt + %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps - %1$s, %2$s + Surround-Sound + 5.1-Surround-Sound + 7.1-Surround-Sound + %1$.2f Mbit/s + %1$s und %2$s diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml index d2e7ab0e9f..98621eaf67 100644 --- a/library/ui/src/main/res/values-es/strings.xml +++ b/library/ui/src/main/res/values-es/strings.xml @@ -23,13 +23,13 @@ Texto Ninguna Automático - Unknown - %1$d × %2$d + Desconocido + %1$d×%2$d Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Estéreo + Sonido envolvente + Sonido envolvente 5.1 + Sonido envolvente 7.1 + %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-et/strings.xml b/library/ui/src/main/res/values-et/strings.xml index e371065736..947d156e64 100644 --- a/library/ui/src/main/res/values-et/strings.xml +++ b/library/ui/src/main/res/values-et/strings.xml @@ -23,13 +23,13 @@ Tekst Ühtegi Automaatne - Unknown + Teadmata %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Ruumiline heli + Ruumiline heli 5.1 + Ruumiline heli 7.1 + %1$.2f Mbit/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-eu/strings.xml b/library/ui/src/main/res/values-eu/strings.xml index e767694ea8..1dcde5e6cb 100644 --- a/library/ui/src/main/res/values-eu/strings.xml +++ b/library/ui/src/main/res/values-eu/strings.xml @@ -23,13 +23,13 @@ Testua Bat ere ez Automatikoa - Unknown + Ezezaguna %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Monoa + Estereoa + Soinu inguratzailea + 5.1 soinu inguratzailea + 7.1 soinu inguratzailea + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml index 5a7995e874..9362fb0460 100644 --- a/library/ui/src/main/res/values-fa/strings.xml +++ b/library/ui/src/main/res/values-fa/strings.xml @@ -23,13 +23,13 @@ نوشتار هیچ‌کدام خودکار - Unknown + نامشخص %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps - %1$s, %2$s + مونو + استریو + صدای فراگیر + صدای فراگیر ۵.۱ + صدای فراگیر ۷٫۱ + %1$.2f مگابیت در ثانیه + %1$s،‏ %2$s diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml index 65e53d0a73..1c307f5214 100644 --- a/library/ui/src/main/res/values-fr/strings.xml +++ b/library/ui/src/main/res/values-fr/strings.xml @@ -23,13 +23,13 @@ Texte Aucun Automatique - Unknown + Inconnu %1$d × %2$d Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Stéréo + Son surround + Son surround 5.1 + Son surround 7.1 + %1$.2f Mbit/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-gl/strings.xml b/library/ui/src/main/res/values-gl/strings.xml index e4631f6585..8b044e99ff 100644 --- a/library/ui/src/main/res/values-gl/strings.xml +++ b/library/ui/src/main/res/values-gl/strings.xml @@ -23,13 +23,13 @@ Texto Ningunha pista Pista automática - Unknown + Descoñecido %1$d × %2$d Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Estéreo + Son envolvente + Son envolvente 5.1 + Son envolvente 7.1 %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-hu/strings.xml b/library/ui/src/main/res/values-hu/strings.xml index 6501ec4060..3ce67aa8f0 100644 --- a/library/ui/src/main/res/values-hu/strings.xml +++ b/library/ui/src/main/res/values-hu/strings.xml @@ -23,13 +23,13 @@ Szöveg Nincs Automatikus - Unknown + Ismeretlen %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Monó + Sztereó + Térhatású hangzás + 5.1-es térhatású hangzás + 7.1-es térhatású hangzás %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-is/strings.xml b/library/ui/src/main/res/values-is/strings.xml index 233744e581..7a02d34448 100644 --- a/library/ui/src/main/res/values-is/strings.xml +++ b/library/ui/src/main/res/values-is/strings.xml @@ -23,13 +23,13 @@ Texti Ekkert Sjálfvirkt - Unknown + Óþekkt %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Einóma + Víðóma + Víðóma hljóð + 5.1 víðóma hljóð + 7.1 víðóma hljóð + %1$.2f Mb/sek. %1$s, %2$s diff --git a/library/ui/src/main/res/values-iw/strings.xml b/library/ui/src/main/res/values-iw/strings.xml index eaa6f6dd72..99c3c3d48e 100644 --- a/library/ui/src/main/res/values-iw/strings.xml +++ b/library/ui/src/main/res/values-iw/strings.xml @@ -23,13 +23,13 @@ טקסט ללא אוטומטי - Unknown + לא ידוע %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps - %1$s, %2$s + מונו + סטריאו + סראונד + סראונד 5.1 + סראונד 7.1 + %1$.2f מגה סיביות לשנייה + %1$s‏, %2$s diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml index 0274a697ae..c24f9e5a84 100644 --- a/library/ui/src/main/res/values-km/strings.xml +++ b/library/ui/src/main/res/values-km/strings.xml @@ -23,13 +23,13 @@ អក្សរ គ្មាន ស្វ័យប្រវត្តិ - Unknown + មិនស្គាល់ %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + ម៉ូ​ណូ + ស្តេរ៉េអូ + សំឡេង​រងំ + សំឡេង​រងំ​ខ្នាត 5.1 + សំឡេង​រងំ​ខ្នាត 7.1 %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-ky/strings.xml b/library/ui/src/main/res/values-ky/strings.xml index 3c56c2cda4..1a1cce14cd 100644 --- a/library/ui/src/main/res/values-ky/strings.xml +++ b/library/ui/src/main/res/values-ky/strings.xml @@ -23,13 +23,13 @@ Текст Жок Авто - Unknown + Белгисиз %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Моно + Стерео + Көлөмдүү добуш + 5.1 көлөмдүү добуш + 7.1 көлөмдүү добуш + %1$.2f Мб/сек. %1$s, %2$s diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml index 1a8e828dd0..7c04e42ca2 100644 --- a/library/ui/src/main/res/values-lt/strings.xml +++ b/library/ui/src/main/res/values-lt/strings.xml @@ -23,13 +23,13 @@ Tekstas Nėra Automatinė - Unknown + Nežinomas %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Monofoninis + Stereofoninis + Erdvinis garsas + 5.1 erdvinis garsas + 7.1 erdvinis garsas + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml index 8cf5745a9a..cf8053ba92 100644 --- a/library/ui/src/main/res/values-lv/strings.xml +++ b/library/ui/src/main/res/values-lv/strings.xml @@ -23,13 +23,13 @@ Teksts Nav Automātisks - Unknown - %1$d × %2$d + Nezināms + %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Ieskaujošā skaņa + 5.1 ieskaujošā skaņa + 7.1 ieskaujošā skaņa + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-ms/strings.xml b/library/ui/src/main/res/values-ms/strings.xml index 807a75c04d..e8556813b8 100644 --- a/library/ui/src/main/res/values-ms/strings.xml +++ b/library/ui/src/main/res/values-ms/strings.xml @@ -23,13 +23,13 @@ Teks Tiada Automatik - Unknown + Tidak diketahui %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Bunyi keliling + Bunyi keliling 5.1 + Bunyi keliling 7.1 %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-nb/strings.xml b/library/ui/src/main/res/values-nb/strings.xml index d3ceccc79c..53779e52e6 100644 --- a/library/ui/src/main/res/values-nb/strings.xml +++ b/library/ui/src/main/res/values-nb/strings.xml @@ -23,13 +23,13 @@ Tekst Ingen Automatisk - Unknown + Ukjent %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Surround-lyd + 5.1 surround-lyd + 7.1 surround-lyd %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml index 3e0495a2ae..c39b4d180d 100644 --- a/library/ui/src/main/res/values-pt-rPT/strings.xml +++ b/library/ui/src/main/res/values-pt-rPT/strings.xml @@ -23,13 +23,13 @@ Texto Nenhuma Automático - Unknown + Desconhecida %1$d × %2$d Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Estéreo + Som surround + Som surround 5.1 + Som surround 7.1 %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml index 4cb384b0ea..a6519084e6 100644 --- a/library/ui/src/main/res/values-sr/strings.xml +++ b/library/ui/src/main/res/values-sr/strings.xml @@ -23,13 +23,13 @@ Текст Ниједна Аутоматски - Unknown + Непознато %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Моно + Стерео + Звучни систем + Звучни систем 5.1 + Звучни систем 7.1 + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml index 9e7f53a20f..e65aed6eba 100644 --- a/library/ui/src/main/res/values-sw/strings.xml +++ b/library/ui/src/main/res/values-sw/strings.xml @@ -23,13 +23,13 @@ SMS Hamna Otomatiki - Unknown + Haijulikani %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Sauti ya mzunguko + Sauti ya mzunguko ya 5.1 + Sauti ya mzunguko ya 7.1 + Mbps %1$.2f %1$s, %2$s diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml index 87302770d6..823af646fb 100644 --- a/library/ui/src/main/res/values-th/strings.xml +++ b/library/ui/src/main/res/values-th/strings.xml @@ -23,13 +23,13 @@ ข้อความ ไม่มี ยานยนต์ - Unknown + ไม่ทราบ %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + โมโน + สเตอริโอ + เสียงเซอร์ราวด์ + ระบบเสียง 5.1 เซอร์ราวด์ + 7.1 เสียงเซอร์ราวด์ %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml index a8bc979af4..cc41d5a302 100644 --- a/library/ui/src/main/res/values-tr/strings.xml +++ b/library/ui/src/main/res/values-tr/strings.xml @@ -23,13 +23,13 @@ Metin Yok Otomatik - Unknown + Bilinmiyor %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Surround ses + 5.1 surround ses + 7.1 surround ses %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml index ba5fe2c75d..69f1306b88 100644 --- a/library/ui/src/main/res/values-zh-rCN/strings.xml +++ b/library/ui/src/main/res/values-zh-rCN/strings.xml @@ -23,13 +23,13 @@ 文字 自动 - Unknown + 未知 %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + 单声道 + 立体声 + 环绕声 + 5.1 环绕声 + 7.1 环绕声 %1$.2f Mbps - %1$s, %2$s + %1$s,%2$s diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml index bfd5b75505..623e889ba6 100644 --- a/library/ui/src/main/res/values-zh-rHK/strings.xml +++ b/library/ui/src/main/res/values-zh-rHK/strings.xml @@ -27,9 +27,9 @@ %1$d × %2$d 單聲道 立體聲 - 環繞音效 - 5.1 環繞音效 - 7.1 環繞音效 + 環迴立體聲 + 5.1 環迴立體聲 + 7.1 環迴立體聲 %1$.2f Mbps %1$s、%2$s