diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index fdd1ef3bba..85675f6c7e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -766,7 +766,7 @@ public final class DownloadManager {
long errorPosition = C.LENGTH_UNSET;
while (true) {
try {
- downloader.download(null);
+ downloader.download();
break;
} catch (IOException e) {
long downloadedBytes = downloader.getDownloadedBytes();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
index b8d9432c63..9f4b560ac8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
@@ -15,7 +15,6 @@
*/
package com.google.android.exoplayer2.offline;
-import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C;
import java.io.IOException;
@@ -24,26 +23,6 @@ import java.io.IOException;
*/
public interface Downloader {
- /**
- * Listener notified when download progresses.
- *
- * No guarantees are made about the thread or threads on which the listener is called, but it is
- * guaranteed that listener methods will be called in a serial fashion (i.e. one at a time) and in
- * the same order as events occurred.
- */
- interface ProgressListener {
- /**
- * Called during the download. Calling intervals depend on the {@link Downloader}
- * implementation.
- *
- * @param downloader The reporting instance.
- * @param downloadPercentage The download percentage. This value can be an estimation.
- * @param downloadedBytes Total number of downloaded bytes.
- * @see #download(ProgressListener)
- */
- void onDownloadProgress(Downloader downloader, float downloadPercentage, long downloadedBytes);
- }
-
/**
* Initializes the downloader.
*
@@ -58,13 +37,11 @@ public interface Downloader {
/**
* Downloads the media.
*
- * @param listener If not null, called during download.
* @throws DownloadException Thrown if the media cannot be downloaded.
* @throws InterruptedException If the thread has been interrupted.
* @throws IOException Thrown when there is an io error while downloading.
*/
- void download(@Nullable ProgressListener listener)
- throws InterruptedException, IOException;
+ void download() throws InterruptedException, IOException;
/**
* Removes all of the downloaded data of the media.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
index 444beaaef0..e7ccc13547 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -16,7 +16,6 @@
package com.google.android.exoplayer2.offline;
import android.net.Uri;
-import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.cache.Cache;
@@ -60,19 +59,12 @@ public final class ProgressiveDownloader implements Downloader {
}
@Override
- public void download(@Nullable ProgressListener listener) throws InterruptedException,
- IOException {
+ public void download() throws InterruptedException, IOException {
priorityTaskManager.add(C.PRIORITY_DOWNLOAD);
try {
byte[] buffer = new byte[BUFFER_SIZE_BYTES];
CacheUtil.cache(dataSpec, cache, dataSource, buffer, priorityTaskManager, C.PRIORITY_DOWNLOAD,
cachingCounters, true);
- // TODO: Work out how to call onDownloadProgress periodically during the download, or else
- // get rid of ProgressListener and move to a model where the manager periodically polls
- // Downloaders.
- if (listener != null) {
- listener.onDownloadProgress(this, 100, cachingCounters.contentLength);
- }
} finally {
priorityTaskManager.remove(C.PRIORITY_DOWNLOAD);
}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
index 63414dc39e..a36c08e0f9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.offline;
import android.net.Uri;
import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSpec;
@@ -146,19 +145,16 @@ public abstract class SegmentDownloader implements Downloader {
* Downloads the content for the selected representations in sync or resumes a previously stopped
* download.
*
- * @param listener If not null, called during download.
* @throws IOException Thrown when there is an io error while downloading.
* @throws DownloadException Thrown if the media cannot be downloaded.
* @throws InterruptedException If the thread has been interrupted.
*/
@Override
- public final synchronized void download(@Nullable ProgressListener listener)
- throws IOException, InterruptedException {
+ public final synchronized void download() throws IOException, InterruptedException {
priorityTaskManager.add(C.PRIORITY_DOWNLOAD);
try {
getManifestIfNeeded(false);
List segments = initStatus(false);
- notifyListener(listener); // Initial notification.
Collections.sort(segments);
byte[] buffer = new byte[BUFFER_SIZE_BYTES];
CachingCounters cachingCounters = new CachingCounters();
@@ -167,7 +163,6 @@ public abstract class SegmentDownloader implements Downloader {
priorityTaskManager, C.PRIORITY_DOWNLOAD, cachingCounters, true);
downloadedBytes += cachingCounters.newlyCachedBytes;
downloadedSegments++;
- notifyListener(listener);
}
} finally {
priorityTaskManager.remove(C.PRIORITY_DOWNLOAD);
@@ -279,12 +274,6 @@ public abstract class SegmentDownloader implements Downloader {
CacheUtil.remove(cache, CacheUtil.generateKey(uri));
}
- private void notifyListener(ProgressListener listener) {
- if (listener != null) {
- listener.onDownloadProgress(this, getDownloadPercentage(), downloadedBytes);
- }
- }
-
/**
* Initializes totalSegments, downloadedSegments and downloadedBytes for selected representations.
* If not offline then downloads missing metadata.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index a4099aa324..45adc8bced 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -668,8 +668,7 @@ public class DownloadManagerTest {
}
@Override
- public void download(@Nullable ProgressListener listener)
- throws InterruptedException, IOException {
+ public void download() throws InterruptedException, IOException {
assertThat(isRemoveAction).isFalse();
started.countDown();
block();
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
index d042788814..85048a27ae 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
@@ -52,13 +52,7 @@ import java.util.List;
* DashDownloader dashDownloader = new DashDownloader(manifestUrl, constructorHelper);
* // Select the first representation of the first adaptation set of the first period
* dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
- * dashDownloader.download(new ProgressListener() {
- * {@literal @}Override
- * public void onDownloadProgress(Downloader downloader, float downloadPercentage,
- * long downloadedBytes) {
- * // Invoked periodically during the download.
- * }
- * });
+ * dashDownloader.download();
* // Access downloaded data using CacheDataSource
* CacheDataSource cacheDataSource =
* new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index 1d3fcb2135..c38dae6953 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.offline.DownloadException;
-import com.google.android.exoplayer2.offline.Downloader.ProgressListener;
import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
import com.google.android.exoplayer2.source.dash.manifest.RepresentationKey;
@@ -47,8 +46,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@@ -125,7 +122,7 @@ public class DashDownloaderTest {
DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
- dashDownloader.download(null);
+ dashDownloader.download();
assertCachedData(cache, fakeDataSet);
}
@@ -146,7 +143,7 @@ public class DashDownloaderTest {
DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
- dashDownloader.download(null);
+ dashDownloader.download();
assertCachedData(cache, fakeDataSet);
}
@@ -167,7 +164,7 @@ public class DashDownloaderTest {
dashDownloader.selectRepresentations(
new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
- dashDownloader.download(null);
+ dashDownloader.download();
assertCachedData(cache, fakeDataSet);
}
@@ -190,7 +187,7 @@ public class DashDownloaderTest {
DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
// dashDownloader.selectRepresentations() isn't called
- dashDownloader.download(null);
+ dashDownloader.download();
assertCachedData(cache, fakeDataSet);
dashDownloader.remove();
@@ -198,7 +195,7 @@ public class DashDownloaderTest {
dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
// clear selection
dashDownloader.selectRepresentations(new RepresentationKey[0]);
- dashDownloader.download(null);
+ dashDownloader.download();
assertCachedData(cache, fakeDataSet);
dashDownloader.remove();
}
@@ -223,7 +220,7 @@ public class DashDownloaderTest {
dashDownloader.selectRepresentations(
new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
- dashDownloader.download(null);
+ dashDownloader.download();
DataSpec[] openedDataSpecs = fakeDataSource.getAndClearOpenedDataSpecs();
assertThat(openedDataSpecs.length).isEqualTo(8);
@@ -257,7 +254,7 @@ public class DashDownloaderTest {
dashDownloader.selectRepresentations(
new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(1, 0, 0)});
- dashDownloader.download(null);
+ dashDownloader.download();
DataSpec[] openedDataSpecs = fakeDataSource.getAndClearOpenedDataSpecs();
assertThat(openedDataSpecs.length).isEqualTo(8);
@@ -289,12 +286,12 @@ public class DashDownloaderTest {
dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
// downloadRepresentations fails on the first try
try {
- dashDownloader.download(null);
+ dashDownloader.download();
fail();
} catch (IOException e) {
// ignore
}
- dashDownloader.download(null);
+ dashDownloader.download();
assertCachedData(cache, fakeDataSet);
}
@@ -322,7 +319,7 @@ public class DashDownloaderTest {
// downloadRepresentations fails after downloading init data, segment 1 and 2 bytes in segment 2
try {
- dashDownloader.download(null);
+ dashDownloader.download();
fail();
} catch (IOException e) {
// ignore
@@ -330,34 +327,11 @@ public class DashDownloaderTest {
dashDownloader.init();
assertCounters(dashDownloader, 4, 2, 10 + 4 + 2);
- dashDownloader.download(null);
+ dashDownloader.download();
assertCounters(dashDownloader, 4, 4, 10 + 4 + 5 + 6);
}
- @Test
- public void testListener() throws Exception {
- FakeDataSet fakeDataSet =
- new FakeDataSet()
- .setData(TEST_MPD_URI, TEST_MPD)
- .setRandomData("audio_init_data", 10)
- .setRandomData("audio_segment_1", 4)
- .setRandomData("audio_segment_2", 5)
- .setRandomData("audio_segment_3", 6);
- DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
-
- dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
- ProgressListener mockListener = Mockito.mock(ProgressListener.class);
- dashDownloader.download(mockListener);
- InOrder inOrder = Mockito.inOrder(mockListener);
- inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 0.0f, 0);
- inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 25.0f, 10);
- inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 50.0f, 14);
- inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 75.0f, 19);
- inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 100.0f, 25);
- inOrder.verifyNoMoreInteractions();
- }
-
@Test
public void testRemoveAll() throws Exception {
FakeDataSet fakeDataSet =
@@ -373,7 +347,7 @@ public class DashDownloaderTest {
DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
dashDownloader.selectRepresentations(
new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
- dashDownloader.download(null);
+ dashDownloader.download();
dashDownloader.remove();
@@ -391,7 +365,7 @@ public class DashDownloaderTest {
dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
dashDownloader.init();
try {
- dashDownloader.download(null);
+ dashDownloader.download();
fail();
} catch (DownloadException e) {
// expected exception.
@@ -415,7 +389,7 @@ public class DashDownloaderTest {
dashDownloader.selectRepresentations(
new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
- dashDownloader.download(null);
+ dashDownloader.download();
assertCachedData(cache, fakeDataSet);
}
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index 2cf6ae712b..00eb2c9059 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -94,7 +94,7 @@ public class HlsDownloaderTest {
public void testSelectRepresentationsClearsPreviousSelection() throws Exception {
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI));
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_2_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertCachedData(
cache,
@@ -109,7 +109,7 @@ public class HlsDownloaderTest {
@Test
public void testCounterMethods() throws Exception {
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertThat(hlsDownloader.getTotalSegments()).isEqualTo(4);
assertThat(hlsDownloader.getDownloadedSegments()).isEqualTo(4);
@@ -120,7 +120,7 @@ public class HlsDownloaderTest {
@Test
public void testInitStatus() throws Exception {
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
HlsDownloader newHlsDownloader = getHlsDownloader(MASTER_PLAYLIST_URI);
newHlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI));
@@ -135,7 +135,7 @@ public class HlsDownloaderTest {
@Test
public void testDownloadRepresentation() throws Exception {
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertCachedData(
cache,
@@ -150,7 +150,7 @@ public class HlsDownloaderTest {
@Test
public void testDownloadMultipleRepresentations() throws Exception {
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_2_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertCachedData(cache, fakeDataSet);
}
@@ -170,7 +170,7 @@ public class HlsDownloaderTest {
hlsDownloader = getHlsDownloader(MASTER_PLAYLIST_URI);
// hlsDownloader.selectRepresentations() isn't called
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertCachedData(cache, fakeDataSet);
hlsDownloader.remove();
@@ -178,7 +178,7 @@ public class HlsDownloaderTest {
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI));
// clear selection
hlsDownloader.selectRepresentations(getKeys());
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertCachedData(cache, fakeDataSet);
hlsDownloader.remove();
}
@@ -186,7 +186,7 @@ public class HlsDownloaderTest {
@Test
public void testRemoveAll() throws Exception {
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_2_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
hlsDownloader.remove();
assertCacheEmpty(cache);
@@ -196,7 +196,7 @@ public class HlsDownloaderTest {
public void testDownloadMediaPlaylist() throws Exception {
hlsDownloader = getHlsDownloader(MEDIA_PLAYLIST_1_URI);
hlsDownloader.selectRepresentations(getKeys(MEDIA_PLAYLIST_1_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertCachedData(
cache,
@@ -219,7 +219,7 @@ public class HlsDownloaderTest {
.setRandomData("fileSequence2.ts", 12);
hlsDownloader = getHlsDownloader(ENC_MEDIA_PLAYLIST_URI);
hlsDownloader.selectRepresentations(getKeys(ENC_MEDIA_PLAYLIST_URI));
- hlsDownloader.download(null);
+ hlsDownloader.download();
assertCachedData(cache, fakeDataSet);
}
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
index 7988523bed..350d1723b8 100644
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
@@ -47,13 +47,7 @@ import java.util.List;
* SsDownloader ssDownloader = new SsDownloader(manifestUrl, constructorHelper);
* // Select the first track of the first stream element
* ssDownloader.selectRepresentations(new TrackKey[] {new TrackKey(0, 0)});
- * ssDownloader.download(new ProgressListener() {
- * {@literal @}Override
- * public void onDownloadProgress(Downloader downloader, float downloadPercentage,
- * long downloadedBytes) {
- * // Invoked periodically during the download.
- * }
- * });
+ * ssDownloader.download();
* // Access downloaded data using CacheDataSource
* CacheDataSource cacheDataSource =
* new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);
diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index 1e82c1fae2..b6ce07d8c5 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -12,14 +12,14 @@
Herhaal alles
Skommel
Volskermmodus
- Download
- Downloads
- Downloading
+ Aflaai
+ Aflaaie
+ Laai tans af
Aflaai is voltooi
Kon nie aflaai nie
Video
- Audio
- Text
+ Oudio
+ SMS
Geen
Outo
diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml
index f9809608fc..adc5154ed4 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -12,14 +12,14 @@
ሁሉንም ድገም
በውዝ
የሙሉ ማያ ሁነታ
- Download
- Downloads
- Downloading
+ አውርድ
+ የወረዱ
+ በማውረድ ላይ
ማውረድ ተጠናቋል
ማውረድ አልተሳካም
- Video
- Audio
- Text
+ ቪዲዮ
+ ኦዲዮ
+ ጽሑፍ
ምንም
ራስ-ሰር
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml
index d8ca87007e..5a60833f6a 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -12,14 +12,14 @@
تكرار الكل
ترتيب عشوائي
وضع ملء الشاشة
- Download
- Downloads
- Downloading
+ تنزيل
+ التنزيلات
+ جارٍ التنزيل.
اكتمل التنزيل
تعذّر التنزيل
- Video
- Audio
- Text
+ فيديو
+ صوت
+ نص
بدون اختيار
تلقائي
diff --git a/library/ui/src/main/res/values-az/strings.xml b/library/ui/src/main/res/values-az/strings.xml
index 57fb794676..a6ac950109 100644
--- a/library/ui/src/main/res/values-az/strings.xml
+++ b/library/ui/src/main/res/values-az/strings.xml
@@ -12,14 +12,14 @@
Hamısı təkrarlansın
Qarışdırın
Tam ekran rejimi
- Download
- Downloads
- Downloading
+ Endirin
+ Endirmələr
+ Endirilir
Endirmə tamamlandı
Endirmə alınmadı
Video
Audio
- Text
+ Mətn
Yoxdur
Avtomatik
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml
index 06612b22f6..d349cf3dbf 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -12,14 +12,14 @@
Повтаряне на всички
Разбъркване
Режим на цял екран
- Download
- Downloads
- Downloading
+ Изтегляне
+ Изтегляния
+ Изтегля се
Изтеглянето завърши
Изтеглянето не бе успешно
- Video
- Audio
- Text
+ Видеозапис
+ Аудиозапис
+ Текст
Нищо
Автоматично
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml
index 6a246bd405..50a877477b 100644
--- a/library/ui/src/main/res/values-bs/strings.xml
+++ b/library/ui/src/main/res/values-bs/strings.xml
@@ -12,14 +12,14 @@
Ponovi sve
Izmiješaj
Način rada preko cijelog ekrana
- Download
- Downloads
- Downloading
+ Preuzmi
+ Preuzimanja
+ Preuzimanje
Preuzimanje je završeno
Preuzimanje nije uspjelo
- Video
- Audio
- Text
+ Videozapis
+ Zvuk
+ Tekst
Ništa
Automatski
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/library/ui/src/main/res/values-es-rUS/strings.xml
index e538c35161..8f47a0e867 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -12,14 +12,14 @@
Repetir todo
Reproducir aleatoriamente
Modo de pantalla completa
- Download
- Downloads
- Downloading
+ Descargar
+ Descargas
+ Descargando
Se completó la descarga
No se pudo descargar
Video
Audio
- Text
+ Texto
Ninguna
Automática
diff --git a/library/ui/src/main/res/values-et/strings.xml b/library/ui/src/main/res/values-et/strings.xml
index fe8b03b775..953dd39843 100644
--- a/library/ui/src/main/res/values-et/strings.xml
+++ b/library/ui/src/main/res/values-et/strings.xml
@@ -20,6 +20,6 @@
Video
Audio
Text
- None
- Auto
+ Ühtegi
+ Automaatne
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml
index 575c30da20..c2d38e43b9 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -12,14 +12,14 @@
Toista kaikki uudelleen
Satunnaistoisto
Koko näytön tila
- Download
- Downloads
- Downloading
+ Lataa
+ Lataukset
+ Ladataan
Lataus valmis
Lataus epäonnistui
Video
- Audio
- Text
+ Ääni
+ Teksti
–
Automaattinen
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml
index 4b12b0db3d..baedd6ab95 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -12,14 +12,14 @@
Tout lire en boucle
Lecture aléatoire
Mode Plein écran
- Download
- Downloads
- Downloading
+ Télécharger
+ Téléchargements
+ Téléchargement en cours…
Téléchargement terminé
Échec du téléchargement
- Video
+ Vidéo
Audio
- Text
+ Texte
Aucun
Auto
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml
index ddc0670734..c2eeab1770 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -12,14 +12,14 @@
Tout lire en boucle
Aléatoire
Mode plein écran
- Download
- Downloads
- Downloading
+ Télécharger
+ Téléchargements
+ Téléchargement…
Téléchargement terminé
Échec du téléchargement
- Video
+ Vidéo
Audio
- Text
+ Texte
Aucun
Automatique
diff --git a/library/ui/src/main/res/values-gl/strings.xml b/library/ui/src/main/res/values-gl/strings.xml
index 42f3000865..3b50f86779 100644
--- a/library/ui/src/main/res/values-gl/strings.xml
+++ b/library/ui/src/main/res/values-gl/strings.xml
@@ -12,14 +12,14 @@
Repetir todas as pistas
Reprodución aleatoria
Modo de pantalla completa
- Download
- Downloads
- Downloading
+ Descargar
+ Descargas
+ Descargando
Completouse a descarga
Produciuse un erro na descarga
- Video
+ Vídeo
Audio
- Text
+ Texto
Ningunha pista
Pista automática
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml
index c58e0e96a0..17f69efe8e 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -12,14 +12,14 @@
Ponovi sve
Reproduciraj nasumično
Prikaz na cijelom zaslonu
- Download
- Downloads
- Downloading
+ Preuzmi
+ Preuzimanja
+ Preuzimanje
Preuzimanje je dovršeno
Preuzimanje nije uspjelo
- Video
- Audio
- Text
+ Videozapis
+ Audiozapis
+ Tekst
Ništa
Automatski
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml
index d07e13dbac..a69d84ff5c 100644
--- a/library/ui/src/main/res/values-hy/strings.xml
+++ b/library/ui/src/main/res/values-hy/strings.xml
@@ -20,6 +20,6 @@
Video
Audio
Text
- None
- Auto
+ Ոչ մեկը
+ Ավտոմատ
diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml
index a6cd5b7772..1cbbebc478 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -13,13 +13,13 @@
Acak
Mode layar penuh
Download
- Downloads
- Downloading
+ Download
+ Mendownload
Download selesai
Download gagal
Video
Audio
- Text
+ Teks
Tidak ada
Otomatis
diff --git a/library/ui/src/main/res/values-it/strings.xml b/library/ui/src/main/res/values-it/strings.xml
index e4e7e58cb6..aa4df50d84 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -12,14 +12,14 @@
Ripeti tutto
Riproduzione casuale
Modalità a schermo intero
- Download
- Downloads
- Downloading
+ Scarica
+ Download
+ Download…
Download completato
Download non riuscito
Video
Audio
- Text
+ Testo
Nessuno
Auto
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index cffbd06865..82f20bf04a 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -12,14 +12,14 @@
全曲をリピート
シャッフル
全画面モード
- Download
- Downloads
- Downloading
+ ダウンロード
+ ダウンロード
+ ダウンロードしています
ダウンロードが完了しました
ダウンロードに失敗しました
- Video
- Audio
- Text
+ 動画
+ 音声
+ SMS
なし
自動
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml
index 2f1f1b233a..0a128ece97 100644
--- a/library/ui/src/main/res/values-ka/strings.xml
+++ b/library/ui/src/main/res/values-ka/strings.xml
@@ -12,14 +12,14 @@
ყველას გამეორება
არეულად დაკვრა
სრულეკრანიანი რეჟიმი
- Download
- Downloads
- Downloading
+ ჩამოტვირთვა
+ ჩამოტვირთვები
+ მიმდინარეობს ჩამოტვირთვა
ჩამოტვირთვა დასრულდა
ჩამოტვირთვა ვერ მოხერხდა
- Video
- Audio
- Text
+ ვიდეო
+ აუდიო
+ SMS
არცერთი
ავტომატური
diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml
index a7a22b8972..03a8470176 100644
--- a/library/ui/src/main/res/values-km/strings.xml
+++ b/library/ui/src/main/res/values-km/strings.xml
@@ -12,14 +12,14 @@
លេងឡើងវិញទាំងអស់
ច្របល់
មុខងារពេញអេក្រង់
- Download
- Downloads
- Downloading
+ ទាញយក
+ ទាញយក
+ កំពុងទាញយក
បានបញ្ចប់ការទាញយក
មិនអាចទាញយកបានទេ
- Video
- Audio
- Text
+ វីដេអូ
+ សំឡេង
+ អក្សរ
គ្មាន
ស្វ័យប្រវត្តិ
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml
index 07492a7b0e..8631026373 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -12,14 +12,14 @@
모두 반복
셔플
전체화면 모드
- Download
- Downloads
- Downloading
+ 다운로드
+ 다운로드
+ 다운로드 중
다운로드 완료
다운로드 실패
- Video
- Audio
- Text
+ 동영상
+ 오디오
+ 문자 메시지
없음
자동
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml
index 38fe1805af..84a8b29dbe 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -20,6 +20,6 @@
Video
Audio
Text
- None
- Auto
+ Nėra
+ Automatinė
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml
index a6aa65d3df..bc4199a49d 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -20,6 +20,6 @@
Video
Audio
Text
- None
- Auto
+ Nav
+ Automātisks
diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml
index 67040de9ef..236f323af6 100644
--- a/library/ui/src/main/res/values-mk/strings.xml
+++ b/library/ui/src/main/res/values-mk/strings.xml
@@ -12,14 +12,14 @@
Повтори ги сите
Измешај
Режим на цел екран
- Download
- Downloads
- Downloading
+ Преземи
+ Преземања
+ Се презема
Преземањето заврши
Неуспешно преземање
- Video
- Audio
- Text
+ Видео
+ Аудио
+ Текст
Нема
Автоматскa
diff --git a/library/ui/src/main/res/values-ml/strings.xml b/library/ui/src/main/res/values-ml/strings.xml
index bb270f84b1..f90f9161e6 100644
--- a/library/ui/src/main/res/values-ml/strings.xml
+++ b/library/ui/src/main/res/values-ml/strings.xml
@@ -20,6 +20,6 @@
Video
Audio
Text
- None
- Auto
+ ഒന്നുമില്ല
+ സ്വമേധയാ
diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml
index 0b8b9036f0..54193e2fbf 100644
--- a/library/ui/src/main/res/values-mn/strings.xml
+++ b/library/ui/src/main/res/values-mn/strings.xml
@@ -12,14 +12,14 @@
Бүгдийг нь дахин тоглуулах
Холих
Бүтэн дэлгэцийн горим
- Download
- Downloads
- Downloading
+ Татах
+ Татaлт
+ Татаж байна
Татаж дууссан
Татаж чадсангүй
- Video
- Audio
- Text
+ Видео
+ Дуу
+ Текст
Байхгүй
Автомат
diff --git a/library/ui/src/main/res/values-my/strings.xml b/library/ui/src/main/res/values-my/strings.xml
index 82da0ab638..f1011309ab 100644
--- a/library/ui/src/main/res/values-my/strings.xml
+++ b/library/ui/src/main/res/values-my/strings.xml
@@ -12,14 +12,14 @@
အားလုံး ပြန်ကျော့ရန်
ရောသမမွှေ
မျက်နှာပြင်အပြည့် မုဒ်
- Download
- Downloads
- Downloading
+ ဒေါင်းလုဒ် လုပ်ရန်
+ ဒေါင်းလုဒ်များ
+ ဒေါင်းလုဒ်လုပ်နေသည်
ဒေါင်းလုဒ်လုပ်ပြီးပါပြီ
ဒေါင်းလုဒ်လုပ်၍ မရပါ
- Video
- Audio
- Text
+ ဗီဒီယို
+ အသံ
+ စာသား
မရှိ
အလိုအလျောက်
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/library/ui/src/main/res/values-nl/strings.xml
index 6f3a408868..e349acbc54 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -12,14 +12,14 @@
Alles herhalen
Shuffle
Modus \'Volledig scherm\'
- Download
+ Downloaden
Downloads
- Downloading
+ Downloaden
Downloaden voltooid
Downloaden mislukt
Video
Audio
- Text
+ Tekst
Geen
Auto
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 674f559546..d8f94a866e 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -12,14 +12,14 @@
Repetir tudo
Reproduzir aleatoriamente
Modo de ecrã inteiro
- Download
- Downloads
- Downloading
+ Transferir
+ Transferências
+ A transferir…
Transferência concluída
Falha na transferência
- Video
- Audio
- Text
+ Vídeo
+ Áudio
+ Texto
Nenhuma
Automático
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml
index 8a9c8c381f..ff4493f813 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -12,14 +12,14 @@
Repetir tudo
Aleatório
Modo de tela cheia
- Download
+ Fazer o download
Downloads
- Downloading
+ Fazendo o download
Download concluído
Falha no download
- Video
- Audio
- Text
+ Vídeo
+ Áudio
+ Texto
Nenhuma
Automática
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/library/ui/src/main/res/values-ro/strings.xml
index 5b8b55ea70..39dedda4d8 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -12,9 +12,9 @@
Repetați-le pe toate
Redați aleatoriu
Modul Ecran complet
- Download
- Downloads
- Downloading
+ Descărcați
+ Descărcări
+ Se descarcă
Descărcarea a fost finalizată
Descărcarea nu a reușit
Video
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/library/ui/src/main/res/values-sk/strings.xml
index 34caa5af0e..1762b5cddf 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -12,13 +12,13 @@
Opakovať všetko
Náhodne prehrávať
Režim celej obrazovky
- Download
- Downloads
- Downloading
+ Stiahnuť
+ Stiahnuté
+ Sťahuje sa
Sťahovanie bolo dokončené
Nepodarilo sa stiahnuť
Video
- Audio
+ Zvuk
Text
Žiadne
Automaticky
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml
index b32176766e..662238f196 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -12,13 +12,13 @@
Upprepa alla
Blanda spår
Helskärmsläge
- Download
- Downloads
- Downloading
+ Ladda ned
+ Nedladdningar
+ Laddar ned
Nedladdningen är klar
Nedladdningen misslyckades
Video
- Audio
+ Ljud
Text
Ingen
Automatiskt
diff --git a/library/ui/src/main/res/values-te/strings.xml b/library/ui/src/main/res/values-te/strings.xml
index c854269eca..21020396d7 100644
--- a/library/ui/src/main/res/values-te/strings.xml
+++ b/library/ui/src/main/res/values-te/strings.xml
@@ -20,6 +20,6 @@
Video
Audio
Text
- None
- Auto
+ ఏదీ కాదు
+ స్వీయ
diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml
index 99c3dfaf60..1ada178113 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -12,14 +12,14 @@
เล่นซ้ำทั้งหมด
สุ่ม
โหมดเต็มหน้าจอ
- Download
- Downloads
- Downloading
+ ดาวน์โหลด
+ ดาวน์โหลด
+ กำลังดาวน์โหลด
การดาวน์โหลดเสร็จสมบูรณ์
การดาวน์โหลดล้มเหลว
- Video
- Audio
- Text
+ วิดีโอ
+ เสียง
+ ข้อความ
ไม่มี
ยานยนต์
diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml
index 81cdeafb20..0ef0ca27c3 100644
--- a/library/ui/src/main/res/values-tl/strings.xml
+++ b/library/ui/src/main/res/values-tl/strings.xml
@@ -12,9 +12,9 @@
Ulitin lahat
I-shuffle
Fullscreen mode
- Download
- Downloads
- Downloading
+ I-download
+ Mga Download
+ Nagda-download
Tapos na ang pag-download
Hindi na-download
Video
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml
index 03a6b06b78..7edb96c5e0 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -12,14 +12,14 @@
Tümünü tekrarla
Karıştır
Tam ekran modu
- Download
- Downloads
- Downloading
+ İndir
+ İndirilenler
+ İndiriliyor
İndirme işlemi tamamlandı
İndirilemedi
Video
- Audio
- Text
+ Ses
+ Metin
Yok
Otomatik
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/library/ui/src/main/res/values-uk/strings.xml
index b9e7377f4e..d5d3178d94 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -12,14 +12,14 @@
Повторити всі
Перемішати
Повноекранний режим
- Download
- Downloads
- Downloading
+ Завантажити
+ Завантаження
+ Завантажується
Завантаження завершено
Не вдалося завантажити
- Video
- Audio
- Text
+ Відео
+ Аудіо
+ Текст
Нічого
Автоматично
diff --git a/library/ui/src/main/res/values-uz/strings.xml b/library/ui/src/main/res/values-uz/strings.xml
index c4ac394b5d..824eb00735 100644
--- a/library/ui/src/main/res/values-uz/strings.xml
+++ b/library/ui/src/main/res/values-uz/strings.xml
@@ -12,14 +12,14 @@
Hammasini takrorlash
Aralash
Butun ekran rejimi
- Download
- Downloads
- Downloading
+ Saqlash
+ Yuklanmalar
+ Yuklab olish
Yuklab olindi
Yuklab olinmadi
Video
Audio
- Text
+ Matn
Hech biri
Avtomatik
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 82d078dd7b..a5366f53b1 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -20,6 +20,6 @@
Video
Audio
Text
- None
- Auto
+ 无
+ 自动
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml
index c5002dd1d9..ed93a8c90d 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -12,14 +12,14 @@
Phinda konke
Shova
Imodi yesikrini esigcwele
- Download
- Downloads
- Downloading
+ Landa
+ Ukulandwa
+ Iyalanda
Ukulanda kuqedile
Ukulanda kuhlulekile
- Video
- Audio
- Text
+ Ividiyo
+ Umsindo
+ Umbhalo
Lutho
Okuzenzakalelayo
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
index dd5369d64d..b85991f34f 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
@@ -20,9 +20,6 @@ import static com.google.common.truth.Truth.assertWithMessage;
import android.net.Uri;
import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-import com.google.android.exoplayer2.offline.Downloader;
-import com.google.android.exoplayer2.offline.Downloader.ProgressListener;
import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
import com.google.android.exoplayer2.source.dash.manifest.AdaptationSet;
import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
@@ -87,11 +84,11 @@ public final class DashDownloadTest extends ActivityInstrumentationTestCase2 keys = new ArrayList<>();
@@ -143,8 +120,7 @@ public final class DashDownloadTest extends ActivityInstrumentationTestCase2= stopAt) {
- Thread.currentThread().interrupt();
- }
- }
-
- }
-
}