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
10bc77c1
authored
Nov 23, 2020
by
olly
Committed by
Ian Baker
Nov 30, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Localize IMA based on device locale by default
PiperOrigin-RevId: 343871061
parent
a04400cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletions
RELEASENOTES.md
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
RELEASENOTES.md
View file @
10bc77c1
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
*
Fix a bug that caused multiple ads in an ad pod to be skipped when one
*
Fix a bug that caused multiple ads in an ad pod to be skipped when one
ad in the ad pod was skipped.
ad in the ad pod was skipped.
*
Fix passing an ads response to the
`ImaAdsLoader`
builder.
*
Fix passing an ads response to the
`ImaAdsLoader`
builder.
*
Set the overlay language based on the device locale by default.
*
Cronet extension:
*
Cronet extension:
*
Fix handling of HTTP status code 200 when making unbounded length range
*
Fix handling of HTTP status code 200 when making unbounded length range
requests (
[
#8090
](
https://github.com/google/ExoPlayer/issues/8090
)
).
requests (
[
#8090
](
https://github.com/google/ExoPlayer/issues/8090
)
).
...
...
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
View file @
10bc77c1
...
@@ -82,6 +82,7 @@ import java.util.Collection;
...
@@ -82,6 +82,7 @@ import java.util.Collection;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Locale
;
import
java.util.Set
;
import
java.util.Set
;
import
org.checkerframework.checker.nullness.qual.MonotonicNonNull
;
import
org.checkerframework.checker.nullness.qual.MonotonicNonNull
;
...
@@ -1912,7 +1913,9 @@ public final class ImaAdsLoader
...
@@ -1912,7 +1913,9 @@ public final class ImaAdsLoader
private
static
final
class
DefaultImaFactory
implements
ImaUtil
.
ImaFactory
{
private
static
final
class
DefaultImaFactory
implements
ImaUtil
.
ImaFactory
{
@Override
@Override
public
ImaSdkSettings
createImaSdkSettings
()
{
public
ImaSdkSettings
createImaSdkSettings
()
{
return
ImaSdkFactory
.
getInstance
().
createImaSdkSettings
();
ImaSdkSettings
settings
=
ImaSdkFactory
.
getInstance
().
createImaSdkSettings
();
settings
.
setLanguage
(
getImaLanguageCodeForDefaultLocale
());
return
settings
;
}
}
@Override
@Override
...
@@ -1953,5 +1956,16 @@ public final class ImaAdsLoader
...
@@ -1953,5 +1956,16 @@ public final class ImaAdsLoader
return
ImaSdkFactory
.
getInstance
()
return
ImaSdkFactory
.
getInstance
()
.
createAdsLoader
(
context
,
imaSdkSettings
,
adDisplayContainer
);
.
createAdsLoader
(
context
,
imaSdkSettings
,
adDisplayContainer
);
}
}
/**
* Returns a language code that's suitable for passing to {@link ImaSdkSettings#setLanguage} and
* corresponds to the device's {@link Locale#getDefault() default Locale}.
*/
// TODO: It may be possible to define a better mapping onto IMA's supported language codes. See:
// https://developers.google.com/interactive-media-ads/docs/sdks/android/client-side/localization.
// IMA will fall back to its default language code ("en") if the value returned is unsupported.
private
static
String
getImaLanguageCodeForDefaultLocale
()
{
return
Util
.
splitAtFirst
(
Util
.
getSystemLanguageCodes
()[
0
],
"-"
)[
0
];
}
}
}
}
}
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