summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2018-11-16 20:03:01 +0000
committerSiyamed Sinir <siyamed@google.com>2018-11-16 20:03:01 +0000
commit321140ad8464dfd22af7ae8d71daa11337680f1d (patch)
tree25c6b6cc111023f91ab1560e3f80b4e18cf725d8 /core/java/android
parent6224e238d6f0c48b419b99d6889997d83350f4e6 (diff)
Revert "Enable PrecomputedText for BiDi text"
This reverts commit 6224e238d6f0c48b419b99d6889997d83350f4e6. Reason for revert: b/119659731 Change-Id: I33ea82d69d09f113d594446f8979f0df21200662
Diffstat (limited to 'core/java/android')
-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 {