sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix RelativeSizeSpan handling in SpannedToHtmlConverter

Browse source 
A silly mistake of confusing a fractional float with a percentage.

PiperOrigin-RevId: 309946004
This commit is contained in:
ibaker 2020-05-05 15:59:50 +01:00 committed by Oliver Woodman
parent 635886449a
commit 5117138481
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverter.java
View file

@ -148,7 +148,7 @@ import java.util.regex.Pattern;
return Util.formatInvariant("<span style='font-size:%.2fpx;'>", sizeCssPx); return Util.formatInvariant("<span style='font-size:%.2fpx;'>", sizeCssPx);
} else if (span instanceof RelativeSizeSpan) { } else if (span instanceof RelativeSizeSpan) {
return Util.formatInvariant( return Util.formatInvariant(
"<span style='font-size:%.2f%%;'>", ((RelativeSizeSpan) span).getSizeChange()); "<span style='font-size:%.2f%%;'>", ((RelativeSizeSpan) span).getSizeChange() * 100);
} else if (span instanceof TypefaceSpan) { } else if (span instanceof TypefaceSpan) {
@Nullable String fontFamily = ((TypefaceSpan) span).getFamily(); @Nullable String fontFamily = ((TypefaceSpan) span).getFamily();
return fontFamily != null return fontFamily != null

2
library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java
View file

@ -135,7 +135,7 @@ public class SpannedToHtmlConverterTest {
public void convert_supportsRelativeSizeSpan() { public void convert_supportsRelativeSizeSpan() {
SpannableString spanned = new SpannableString("String with 10% section"); SpannableString spanned = new SpannableString("String with 10% section");
spanned.setSpan( spanned.setSpan(
new RelativeSizeSpan(/* proportion= */ 10), new RelativeSizeSpan(/* proportion= */ 0.1f),
"String with ".length(), "String with ".length(),
"String with 10%".length(), "String with 10%".length(),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);