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

Merge "Fix BoringLayout with PrecomputedText" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-24 21:03:31 +00:00
committed by Android (Google) Code Review
parent c8ab224b2a 53145635e4
commit 5dbb3fe124
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/text/BoringLayout.java
View File

@@ -347,14 +347,7 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback
TextLine line = TextLine.obtain();
line.set(paint, text, 0, textLength, Layout.DIR_LEFT_TO_RIGHT,
Layout.DIRS_ALL_LEFT_TO_RIGHT, false, null);
if (text instanceof PrecomputedText) {
PrecomputedText mt = (PrecomputedText) text;
// Reaching here means there is only one paragraph.
MeasuredParagraph mp = mt.getMeasuredParagraph(0);
fm.width = (int) Math.ceil(mp.getWidth(0, mp.getTextLength()));
} else {
fm.width = (int) Math.ceil(line.metrics(fm));
}
fm.width = (int) Math.ceil(line.metrics(fm));
TextLine.recycle(line);
return fm;

5
core/java/android/text/TextLine.java
View File

@@ -172,7 +172,12 @@ public class TextLine {
mComputed = null;
if (text instanceof PrecomputedText) {
// Here, no need to check line break strategy or hyphenation frequency since there is no
// line break concept here.
mComputed = (PrecomputedText) text;
if (!mComputed.getParams().getTextPaint().equalsForTextMeasurement(paint)) {
mComputed = null;
}
}
mCharsValid = hasReplacement || hasTabs || directions != Layout.DIRS_ALL_LEFT_TO_RIGHT;