SubtitleView - New method setApplyEmbeddedFontSizes

When option is set to false, SubtitlePainter strips all absolute
and relative font size spans from the cue text.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=152484724

library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java

@@ -27,9 +27,12 @@ import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.RectF;
 import android.text.Layout.Alignment;
 import android.text.Layout.Alignment;
+import android.text.SpannableStringBuilder;
 import android.text.StaticLayout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.TextUtils;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.RelativeSizeSpan;
 import android.util.DisplayMetrics;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Log;
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
@@ -79,6 +82,7 @@ import com.google.android.exoplayer2.util.Util;
   private float cueSize;
   private float cueSize;
   private float cueBitmapHeight;
   private float cueBitmapHeight;
   private boolean applyEmbeddedStyles;
   private boolean applyEmbeddedStyles;
+  private boolean applyEmbeddedFontSizes;
   private int foregroundColor;
   private int foregroundColor;
   private int backgroundColor;
   private int backgroundColor;
   private int windowColor;
   private int windowColor;
@@ -133,6 +137,8 @@ import com.google.android.exoplayer2.util.Util;
    *
    *
    * @param cue The cue to draw.
    * @param cue The cue to draw.
    * @param applyEmbeddedStyles Whether styling embedded within the cue should be applied.
    * @param applyEmbeddedStyles Whether styling embedded within the cue should be applied.
+   * @param applyEmbeddedFontSizes If {@code applyEmbeddedStyles} is true, defines whether font
+   *     sizes embedded within the cue should be applied. Otherwise, it is ignored.
    * @param style The style to use when drawing the cue text.
    * @param style The style to use when drawing the cue text.
    * @param textSizePx The text size to use when drawing the cue text, in pixels.
    * @param textSizePx The text size to use when drawing the cue text, in pixels.
    * @param bottomPaddingFraction The bottom padding fraction to apply when {@link Cue#line} is
    * @param bottomPaddingFraction The bottom padding fraction to apply when {@link Cue#line} is
@@ -143,24 +149,37 @@ import com.google.android.exoplayer2.util.Util;
    * @param cueBoxRight The right position of the enclosing cue box.
    * @param cueBoxRight The right position of the enclosing cue box.
    * @param cueBoxBottom The bottom position of the enclosing cue box.
    * @param cueBoxBottom The bottom position of the enclosing cue box.
    */
    */
-  public void draw(Cue cue, boolean applyEmbeddedStyles, CaptionStyleCompat style, float textSizePx,
-      float bottomPaddingFraction, Canvas canvas, int cueBoxLeft, int cueBoxTop, int cueBoxRight,
-      int cueBoxBottom) {
+  public void draw(Cue cue, boolean applyEmbeddedStyles, boolean applyEmbeddedFontSizes,
+      CaptionStyleCompat style, float textSizePx, float bottomPaddingFraction, Canvas canvas,
+      int cueBoxLeft, int cueBoxTop, int cueBoxRight, int cueBoxBottom) {
     boolean isTextCue = cue.bitmap == null;
     boolean isTextCue = cue.bitmap == null;
     CharSequence cueText = null;
     CharSequence cueText = null;
     Bitmap cueBitmap = null;
     Bitmap cueBitmap = null;
     int windowColor = Color.BLACK;
     int windowColor = Color.BLACK;
     if (isTextCue) {
     if (isTextCue) {
-      cueText = cue.text;
-      if (TextUtils.isEmpty(cueText)) {
+      if (TextUtils.isEmpty(cue.text)) {
         // Nothing to draw.
         // Nothing to draw.
         return;
         return;
       }
       }
-      windowColor = cue.windowColorSet ? cue.windowColor : style.windowColor;
-      if (!applyEmbeddedStyles) {
-        // Strip out any embedded styling.
-        cueText = cueText.toString();
-        windowColor = style.windowColor;
+      windowColor = (cue.windowColorSet && applyEmbeddedStyles)
+          ? cue.windowColor : style.windowColor;
+      // Remove embedded styling or font size if requested.
+      if (applyEmbeddedFontSizes && applyEmbeddedStyles) {
+        cueText = cue.text;
+      } else if (!applyEmbeddedStyles) {
+        cueText = cue.text.toString(); // Equivalent to erasing all spans.
+      } else {
+        SpannableStringBuilder newCueText = new SpannableStringBuilder(cue.text);
+        int cueLength = newCueText.length();
+        AbsoluteSizeSpan[] absSpans = newCueText.getSpans(0, cueLength, AbsoluteSizeSpan.class);
+        RelativeSizeSpan[] relSpans = newCueText.getSpans(0, cueLength, RelativeSizeSpan.class);
+        for (AbsoluteSizeSpan absSpan : absSpans) {
+          newCueText.removeSpan(absSpan);
+        }
+        for (RelativeSizeSpan relSpan : relSpans) {
+          newCueText.removeSpan(relSpan);
+        }
+        cueText = newCueText;
       }
       }
     } else {
     } else {
       cueBitmap = cue.bitmap;
       cueBitmap = cue.bitmap;
@@ -176,6 +195,7 @@ import com.google.android.exoplayer2.util.Util;
         && this.cueSize == cue.size
         && this.cueSize == cue.size
         && this.cueBitmapHeight == cue.bitmapHeight
         && this.cueBitmapHeight == cue.bitmapHeight
         && this.applyEmbeddedStyles == applyEmbeddedStyles
         && this.applyEmbeddedStyles == applyEmbeddedStyles
+        && this.applyEmbeddedFontSizes == applyEmbeddedFontSizes
         && this.foregroundColor == style.foregroundColor
         && this.foregroundColor == style.foregroundColor
         && this.backgroundColor == style.backgroundColor
         && this.backgroundColor == style.backgroundColor
         && this.windowColor == windowColor
         && this.windowColor == windowColor
@@ -204,6 +224,7 @@ import com.google.android.exoplayer2.util.Util;
     this.cueSize = cue.size;
     this.cueSize = cue.size;
     this.cueBitmapHeight = cue.bitmapHeight;
     this.cueBitmapHeight = cue.bitmapHeight;
     this.applyEmbeddedStyles = applyEmbeddedStyles;
     this.applyEmbeddedStyles = applyEmbeddedStyles;
+    this.applyEmbeddedFontSizes = applyEmbeddedFontSizes;
     this.foregroundColor = style.foregroundColor;
     this.foregroundColor = style.foregroundColor;
     this.backgroundColor = style.backgroundColor;
     this.backgroundColor = style.backgroundColor;
     this.windowColor = windowColor;
     this.windowColor = windowColor;

library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java

@@ -60,6 +60,7 @@ public final class SubtitleView extends View implements TextRenderer.Output {
   private int textSizeType;
   private int textSizeType;
   private float textSize;
   private float textSize;
   private boolean applyEmbeddedStyles;
   private boolean applyEmbeddedStyles;
+  private boolean applyEmbeddedFontSizes;
   private CaptionStyleCompat style;
   private CaptionStyleCompat style;
   private float bottomPaddingFraction;
   private float bottomPaddingFraction;
 
 
@@ -73,6 +74,7 @@ public final class SubtitleView extends View implements TextRenderer.Output {
     textSizeType = FRACTIONAL;
     textSizeType = FRACTIONAL;
     textSize = DEFAULT_TEXT_SIZE_FRACTION;
     textSize = DEFAULT_TEXT_SIZE_FRACTION;
     applyEmbeddedStyles = true;
     applyEmbeddedStyles = true;
+    applyEmbeddedFontSizes = true;
     style = CaptionStyleCompat.DEFAULT;
     style = CaptionStyleCompat.DEFAULT;
     bottomPaddingFraction = DEFAULT_BOTTOM_PADDING_FRACTION;
     bottomPaddingFraction = DEFAULT_BOTTOM_PADDING_FRACTION;
   }
   }
@@ -166,14 +168,32 @@ public final class SubtitleView extends View implements TextRenderer.Output {
 
 
   /**
   /**
    * Sets whether styling embedded within the cues should be applied. Enabled by default.
    * Sets whether styling embedded within the cues should be applied. Enabled by default.
+   * Overrides any setting made with {@link SubtitleView#setApplyEmbeddedFontSizes}.
    *
    *
    * @param applyEmbeddedStyles Whether styling embedded within the cues should be applied.
    * @param applyEmbeddedStyles Whether styling embedded within the cues should be applied.
    */
    */
   public void setApplyEmbeddedStyles(boolean applyEmbeddedStyles) {
   public void setApplyEmbeddedStyles(boolean applyEmbeddedStyles) {
-    if (this.applyEmbeddedStyles == applyEmbeddedStyles) {
+    if (this.applyEmbeddedStyles == applyEmbeddedStyles
+        && this.applyEmbeddedFontSizes == applyEmbeddedStyles) {
       return;
       return;
     }
     }
     this.applyEmbeddedStyles = applyEmbeddedStyles;
     this.applyEmbeddedStyles = applyEmbeddedStyles;
+    this.applyEmbeddedFontSizes = applyEmbeddedStyles;
+    // Invalidate to trigger drawing.
+    invalidate();
+  }
+
+  /**
+   * Sets whether font sizes embedded within the cues should be applied. Enabled by default.
+   * Only takes effect if {@link SubtitleView#setApplyEmbeddedStyles} is set to true.
+   *
+   * @param applyEmbeddedFontSizes Whether font sizes embedded within the cues should be applied.
+   */
+  public void setApplyEmbeddedFontSizes(boolean applyEmbeddedFontSizes) {
+    if (this.applyEmbeddedFontSizes == applyEmbeddedFontSizes) {
+      return;
+    }
+    this.applyEmbeddedFontSizes = applyEmbeddedFontSizes;
     // Invalidate to trigger drawing.
     // Invalidate to trigger drawing.
     invalidate();
     invalidate();
   }
   }
@@ -243,8 +263,8 @@ public final class SubtitleView extends View implements TextRenderer.Output {
     }
     }
 
 
     for (int i = 0; i < cueCount; i++) {
     for (int i = 0; i < cueCount; i++) {
-      painters.get(i).draw(cues.get(i), applyEmbeddedStyles, style, textSizePx,
-          bottomPaddingFraction, canvas, left, top, right, bottom);
+      painters.get(i).draw(cues.get(i), applyEmbeddedStyles, applyEmbeddedFontSizes, style,
+          textSizePx, bottomPaddingFraction, canvas, left, top, right, bottom);
     }
     }
   }
   }