Re-enable fallbackLineSpacing
Bug: 145145231
Test: ./gradlew test
Test: ./gradlew connectedAndroidTest
Change-Id: I159a55765f99fb0591413070a6c532158a219618
diff --git a/ui/ui-android-text/src/androidTest/assets/sample_font.ttf b/ui/ui-android-text/src/androidTest/assets/sample_font.ttf
index 711c207..da7301a 100644
--- a/ui/ui-android-text/src/androidTest/assets/sample_font.ttf
+++ b/ui/ui-android-text/src/androidTest/assets/sample_font.ttf
Binary files differ
diff --git a/ui/ui-android-text/src/androidTest/assets/sample_font.ttx b/ui/ui-android-text/src/androidTest/assets/sample_font.ttx
index f97a6af0..95d0619 100644
--- a/ui/ui-android-text/src/androidTest/assets/sample_font.ttx
+++ b/ui/ui-android-text/src/androidTest/assets/sample_font.ttx
@@ -21,6 +21,7 @@
<GlyphID id="2" name="1em_rtl"/>
<GlyphID id="3" name="space"/>
<GlyphID id="4" name="hyphen"/>
+ <GlyphID id="5" name="linefeed"/>
</GlyphOrder>
<head>
@@ -132,12 +133,14 @@
<mtx name="1em_rtl" width="1000" lsb="0"/>
<mtx name="space" width="1000" lsb="0"/>
<mtx name="hyphen" width="1000" lsb="0"/>
+ <mtx name="linefeed" width="500" lsb="0"/>
</hmtx>
<cmap>
<tableVersion version="0"/>
<cmap_format_4 platformID="3" platEncID="10" language="0">
<map code="0x0009" name="1em" /> <!-- TAB -->
+ <map code="0x000A" name="linefeed" /> <!-- LINEFEED -->
<map code="0x0020" name="space" /> <!-- SPACE -->
<map code="0x002C" name="1em" /> <!-- , -->
<map code="0x002D" name="hyphen" /> <!-- - -->
@@ -267,6 +270,7 @@
</contour>
<instructions />
</TTGlyph>
+ <TTGlyph name="linefeed" xMin="0" yMin="-200" xMax="0" yMax="800" />
</glyf>
<name>
@@ -311,4 +315,4 @@
<maxMemType1 value="0"/>
</post>
-</ttFont>
\ No newline at end of file
+</ttFont>
diff --git a/ui/ui-android-text/src/main/java/androidx/text/StaticLayoutFactory.kt b/ui/ui-android-text/src/main/java/androidx/text/StaticLayoutFactory.kt
index 58edc3a..8c767e2 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/StaticLayoutFactory.kt
+++ b/ui/ui-android-text/src/main/java/androidx/text/StaticLayoutFactory.kt
@@ -88,7 +88,6 @@
@JustificationMode
justificationMode: Int = LayoutCompat.DEFAULT_JUSTIFICATION_MODE,
includePadding: Boolean = LayoutCompat.DEFAULT_INCLUDE_PADDING,
- @Suppress("UNUSED_PARAMETER")
fallbackLineSpacing: Boolean = LayoutCompat.DEFAULT_FALLBACK_LINE_SPACING,
@BreakStrategy
breakStrategy: Int = LayoutCompat.DEFAULT_BREAK_STRATEGY,
@@ -118,7 +117,7 @@
}
setIncludePad(includePadding)
if (Build.VERSION.SDK_INT >= 28) {
-// setUseLineSpacingFromFallbacks(fallbackLineSpacing)
+ setUseLineSpacingFromFallbacks(fallbackLineSpacing)
}
setBreakStrategy(breakStrategy)
setHyphenationFrequency(hyphenationFrequency)
diff --git a/ui/ui-text/src/androidTest/font_ttx/sample_font.ttx b/ui/ui-text/src/androidTest/font_ttx/sample_font.ttx
index 11225c9..1d0736c 100644
--- a/ui/ui-text/src/androidTest/font_ttx/sample_font.ttx
+++ b/ui/ui-text/src/androidTest/font_ttx/sample_font.ttx
@@ -20,6 +20,7 @@
<GlyphID id="1" name="1em"/>
<GlyphID id="2" name="1em_rtl"/>
<GlyphID id="3" name="space"/>
+ <GlyphID id="4" name="linefeed"/>
</GlyphOrder>
<head>
@@ -130,12 +131,14 @@
<mtx name="1em" width="1000" lsb="0"/>
<mtx name="1em_rtl" width="1000" lsb="0"/>
<mtx name="space" width="1000" lsb="0"/>
+ <mtx name="linefeed" width="500" lsb="0"/>
</hmtx>
<cmap>
<tableVersion version="0"/>
<cmap_format_4 platformID="3" platEncID="10" language="0">
<map code="0x0009" name="1em" /> <!-- TAB -->
+ <map code="0x000A" name="linefeed" /> <!-- LINEFEED -->
<map code="0x0020" name="space" /> <!-- SPACE -->
<map code="0x002C" name="1em" /> <!-- , -->
<map code="0x002D" name="1em" /> <!-- - -->
@@ -247,14 +250,16 @@
<instructions />
</TTGlyph>
<TTGlyph name="space" xMin="0" yMin="-200" xMax="1000" yMax="800">
- <contour>
- <pt x="0" y="0" on="1"/>
- <pt x="1000" y="0" on="1"/>
- <pt x="1000" y="10" on="1"/>
- <pt x="0" y="10" on="1"/>
- </contour>
- <instructions />
- </TTGlyph>
+ <contour>
+ <pt x="0" y="0" on="1"/>
+ <pt x="1000" y="0" on="1"/>
+ <pt x="1000" y="10" on="1"/>
+ <pt x="0" y="10" on="1"/>
+ </contour>
+ <instructions />
+ </TTGlyph>
+ <TTGlyph name="linefeed" xMin="0" yMin="-200" xMax="0" yMax="800"/>
+
</glyf>
<name>
@@ -299,4 +304,4 @@
<maxMemType1 value="0"/>
</post>
-</ttFont>
\ No newline at end of file
+</ttFont>
diff --git a/ui/ui-text/src/androidTest/res/font/sample_font.ttf b/ui/ui-text/src/androidTest/res/font/sample_font.ttf
index 382a737..dc10688 100644
--- a/ui/ui-text/src/androidTest/res/font/sample_font.ttf
+++ b/ui/ui-text/src/androidTest/res/font/sample_font.ttf
Binary files differ
