diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-24 21:03:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-24 21:03:31 +0000 |
| commit | 5dbb3fe124cfc1d08320448aa397a5b2279ecb73 (patch) | |
| tree | 4eff80da6cd779e42b8df0fc6996ca8f72d787e3 /core/java/android/text/TextLine.java | |
| parent | c8ab224b2a7bea493eb3235b10a961fd1c6d548d (diff) | |
| parent | 53145635e4fd724208e01db1ef6187a2212d6090 (diff) | |
Merge "Fix BoringLayout with PrecomputedText" into pi-dev
Diffstat (limited to 'core/java/android/text/TextLine.java')
| -rw-r--r-- | core/java/android/text/TextLine.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 117a77d32997..fcb7d620f395 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -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; |