Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[DO NOT MERGE] Prevent TextInterpolator from rendering nonprintable newlines" into tm-qpr-dev

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-08-15 20:02:44 +00:00
committed by Android (Google) Code Review
parent 52ef44fe44 f50aadd281
commit b1267ef704
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt
View File

@@ -485,7 +485,13 @@ class TextInterpolator(
val out = mutableListOf<List<PositionedGlyphs>>() val out = mutableListOf<List<PositionedGlyphs>>()
for (lineNo in 0 until layout.lineCount) { // Shape all lines. for (lineNo in 0 until layout.lineCount) { // Shape all lines.
val lineStart = layout.getLineStart(lineNo) val lineStart = layout.getLineStart(lineNo)
val count = layout.getLineEnd(lineNo) - lineStart var count = layout.getLineEnd(lineNo) - lineStart
// Do not render the last character in the line if it's a newline and unprintable
val last = lineStart + count - 1
if (last > lineStart && last < layout.text.length && layout.text[last] == '\n') {
count--
}
val runs = mutableListOf<PositionedGlyphs>() val runs = mutableListOf<PositionedGlyphs>()
TextShaper.shapeText(layout.text, lineStart, count, layout.textDirectionHeuristic, TextShaper.shapeText(layout.text, lineStart, count, layout.textDirectionHeuristic,
paint) { _, _, glyphs, _ -> paint) { _, _, glyphs, _ ->