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
9cfc75ff
authored
Jan 20, 2020
by
ibaker
Committed by
Ian Baker
Jan 24, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix warning about adjacent overload methods in TtmlStyle
PiperOrigin-RevId: 290610936
parent
f7470c51
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
View file @
9cfc75ff
...
...
@@ -166,24 +166,24 @@ import java.lang.annotation.RetentionPolicy;
}
/**
* Inherits from an ancestor style. Properties like <i>tts:backgroundColor</i> which
* are not inheritable are not inherited as well as properties which are already set locally
* are never overridden.
* Chains this style to referential style. Local properties which are already set are never
* overridden.
*
* @param ancestor the
ancestor
style to inherit from
* @param ancestor the
referential
style to inherit from
*/
public
TtmlStyle
inherit
(
TtmlStyle
ancestor
)
{
return
inherit
(
ancestor
,
fals
e
);
public
TtmlStyle
chain
(
TtmlStyle
ancestor
)
{
return
inherit
(
ancestor
,
tru
e
);
}
/**
* Chains this style to referential style. Local properties which are already set
* are never overridden.
* Inherits from an ancestor style. Properties like <i>tts:backgroundColor</i> which are not
* inheritable are not inherited as well as properties which are already set locally are never
* overridden.
*
* @param ancestor the
referential
style to inherit from
* @param ancestor the
ancestor
style to inherit from
*/
public
TtmlStyle
chain
(
TtmlStyle
ancestor
)
{
return
inherit
(
ancestor
,
tru
e
);
public
TtmlStyle
inherit
(
TtmlStyle
ancestor
)
{
return
inherit
(
ancestor
,
fals
e
);
}
private
TtmlStyle
inherit
(
TtmlStyle
ancestor
,
boolean
chaining
)
{
...
...
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