From 5117138481cd08729ba91f6862f789966fa17e89 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 5 May 2020 15:59:50 +0100 Subject: [PATCH] Fix RelativeSizeSpan handling in SpannedToHtmlConverter A silly mistake of confusing a fractional float with a percentage. PiperOrigin-RevId: 309946004 --- .../google/android/exoplayer2/ui/SpannedToHtmlConverter.java | 2 +- .../android/exoplayer2/ui/SpannedToHtmlConverterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java index 496598bead..8f61902205 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java @@ -148,7 +148,7 @@ import java.util.regex.Pattern; return Util.formatInvariant("", sizeCssPx); } else if (span instanceof RelativeSizeSpan) { return Util.formatInvariant( - "", ((RelativeSizeSpan) span).getSizeChange()); + "", ((RelativeSizeSpan) span).getSizeChange() * 100); } else if (span instanceof TypefaceSpan) { @Nullable String fontFamily = ((TypefaceSpan) span).getFamily(); return fontFamily != null diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java index fc4d044a53..ad62506324 100644 --- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java +++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java @@ -135,7 +135,7 @@ public class SpannedToHtmlConverterTest { public void convert_supportsRelativeSizeSpan() { SpannableString spanned = new SpannableString("String with 10% section"); spanned.setSpan( - new RelativeSizeSpan(/* proportion= */ 10), + new RelativeSizeSpan(/* proportion= */ 0.1f), "String with ".length(), "String with 10%".length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);