summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ahaan Ugale <augale@google.com> 2021-02-08 18:08:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-02-08 18:08:59 +0000
commitdba0fb5580c7881b4981a5f30fd4be623fef30ce (patch)
tree769309f08e58f70dfea4f27546a5aaab5d2c0b8b
parentfb51ab66676d5f5b72d8120ff091f3290db9cfe1 (diff)
parent5b873f1366e84241015a81786761ef147790bf9b (diff)
Merge "Fix ellipsis reinitialization for static cached StaticLayout." into sc-dev
-rw-r--r--core/java/android/text/StaticLayout.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 85911fffc1bf..f99d4300a848 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -977,6 +977,9 @@ public class StaticLayout extends Layout {
calculateEllipsis(start, end, measured, widthStart,
ellipsisWidth, ellipsize, j,
textWidth, paint, forceEllipsis);
+ } else {
+ mLines[mColumns * j + ELLIPSIS_START] = 0;
+ mLines[mColumns * j + ELLIPSIS_COUNT] = 0;
}
}