loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warning about adjacent overload methods in TtmlStyle

Browse Source 
PiperOrigin-RevId: 290610936
This commit is contained in:
ibaker 2020-01-20 14:59:21 +00:00 committed by Ian Baker
parent f7470c5126
commit 9cfc75ff8a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
View File

@ -166,19 +166,8 @@ import java.lang.annotation.RetentionPolicy;
} }
/** /**
* Inherits from an ancestor style. Properties like <i>tts:backgroundColor</i> which * Chains this style to referential style. Local properties which are already set are never
* are not inheritable are not inherited as well as properties which are already set locally * overridden.
* are never overridden.
*
* @param ancestor the ancestor style to inherit from
*/
public TtmlStyle inherit(TtmlStyle ancestor) {
return inherit(ancestor, false);
}
/**
* Chains this style to referential style. Local properties which are already set
* are never overridden.
* *
* @param ancestor the referential style to inherit from * @param ancestor the referential style to inherit from
*/ */
@ -186,6 +175,17 @@ import java.lang.annotation.RetentionPolicy;
return inherit(ancestor, true); return inherit(ancestor, true);
} }
/**
* 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 ancestor style to inherit from
*/
public TtmlStyle inherit(TtmlStyle ancestor) {
return inherit(ancestor, false);
}
private TtmlStyle inherit(TtmlStyle ancestor, boolean chaining) { private TtmlStyle inherit(TtmlStyle ancestor, boolean chaining) {
if (ancestor != null) { if (ancestor != null) {
if (!hasFontColor && ancestor.hasFontColor) { if (!hasFontColor && ancestor.hasFontColor) {