diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-06-13 15:45:38 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-06-13 15:54:55 -0700 |
| commit | 8d44fff7e62f77c3b3072a96712cc1389e63ca64 (patch) | |
| tree | b1b60b75b94ecb473c1eb96cb8a1852ca609068f /core/java/android/text/StaticLayout.java | |
| parent | 68cefd201809372a547257a273b805cabbd0da68 (diff) | |
Fix bug #6661824 Hebrew Text can be clipped
- use the correct ellipsis char in both measurement and rendered string
Change-Id: Ia00285fc16da528f18702719026503b5d0610642
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 299e1159c27a..6973b2e39ada 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -745,7 +745,8 @@ public class StaticLayout extends Layout { } float ellipsisWidth = paint.measureText( - (where == TextUtils.TruncateAt.END_SMALL) ? ELLIPSIS_TWO_DOTS : ELLIPSIS_NORMAL); + (where == TextUtils.TruncateAt.END_SMALL) ? + ELLIPSIS_TWO_DOTS : ELLIPSIS_NORMAL, 0, 1); int ellipsisStart = 0; int ellipsisCount = 0; int len = lineEnd - lineStart; @@ -985,9 +986,6 @@ public class StaticLayout extends Layout { private static final double EXTRA_ROUNDING = 0.5; - private static final String ELLIPSIS_NORMAL = "\u2026"; // this is "..." - private static final String ELLIPSIS_TWO_DOTS = "\u2025"; // this is ".." - private static final int CHAR_FIRST_HIGH_SURROGATE = 0xD800; private static final int CHAR_LAST_LOW_SURROGATE = 0xDFFF; |