Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
6f752452
authored
Aug 13, 2020
by
olly
Committed by
kim-vde
Aug 17, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Demo app: Update concatenation terminology to use "playlist"
PiperOrigin-RevId: 326401528
parent
cda35f66
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
demos/main/src/main/res/values/strings.xml
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View file @
6f752452
...
...
@@ -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
;
}
...
...
demos/main/src/main/res/values/strings.xml
View file @
6f752452
...
...
@@ -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 concatenation
s
</string>
<string
name=
"unsupported_ads_in_
playlist"
>
Playing without ads, as ads are not supported in playlist
s
</string>
<string
name=
"download_start_error"
>
Failed to start download
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment