summaryrefslogtreecommitdiff
path: root/core/java/android/text/TextLine.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-11-16 21:37:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-11-16 21:37:12 +0000
commit5eee684bd42e6551071e0ae93703216a1f6ff6ac (patch)
tree0ca3ad525f54d1f3b3c891bcdb0f5e9529c05ce1 /core/java/android/text/TextLine.java
parente2dc21e1a38769aca4d32d8da4e4fc85200c8c21 (diff)
parent321140ad8464dfd22af7ae8d71daa11337680f1d (diff)
Merge "Revert "Enable PrecomputedText for BiDi text""
Diffstat (limited to 'core/java/android/text/TextLine.java')
-rw-r--r--core/java/android/text/TextLine.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java
index 6eb433abf16c..7b638b4c4a63 100644
--- a/core/java/android/text/TextLine.java
+++ b/core/java/android/text/TextLine.java
@@ -201,7 +201,7 @@ public class TextLine {
}
}
- mCharsValid = hasReplacement;
+ mCharsValid = hasReplacement || hasTabs || directions != Layout.DIRS_ALL_LEFT_TO_RIGHT;
if (mCharsValid) {
if (mChars == null || mChars.length < mLen) {
@@ -815,6 +815,7 @@ public class TextLine {
} else {
final int delta = mStart;
if (mComputed == null) {
+ // TODO: Enable measured getRunAdvance for ReplacementSpan and RTL text.
return wp.getRunAdvance(mText, delta + start, delta + end,
delta + contextStart, delta + contextEnd, runIsRtl, delta + offset);
} else {