From 6f7524521b0ab19d49f9a01aab40080947ce4c56 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 13 Aug 2020 09:18:32 +0100
Subject: [PATCH] Demo app: Update concatenation terminology to use "playlist"

PiperOrigin-RevId: 326401528
---
 .../java/com/google/android/exoplayer2/demo/PlayerActivity.java | 2 +-
 demos/main/src/main/res/values/strings.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index d75c11a77c..797eb503dd 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -520,7 +520,7 @@ public class PlayerActivity extends AppCompatActivity
     @Override
     public AdsLoader getAdsLoader(Uri adTagUri) {
       if (mediaItems.size() > 1) {
-        showToast(R.string.unsupported_ads_in_concatenation);
+        showToast(R.string.unsupported_ads_in_playlist);
         releaseAdsLoader();
         return null;
       }
diff --git a/demos/main/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
index 2b3588754f..3f80b70184 100644
--- a/demos/main/src/main/res/values/strings.xml
+++ b/demos/main/src/main/res/values/strings.xml
@@ -51,7 +51,7 @@
 
   <string name="sample_list_load_error">One or more sample lists failed to load</string>
 
-  <string name="unsupported_ads_in_concatenation">Playing sample without ads, as ads are not supported in concatenations</string>
+  <string name="unsupported_ads_in_playlist">Playing without ads, as ads are not supported in playlists</string>
 
   <string name="download_start_error">Failed to start download</string>