summaryrefslogtreecommitdiff
path: root/core/java/android/text/StaticLayout.java
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2013-03-29 09:25:48 -0700
committerRaph Levien <raph@google.com>2013-03-29 09:25:48 -0700
commit8d087c349f0a3b7946a95869562f020892d47a86 (patch)
treef1f82fa59e13bc033fa78efb16c5ba8cf56677eb /core/java/android/text/StaticLayout.java
parentaad37a1eeb4dcd35500a382401b889d34f6430d2 (diff)
Make zero width space a line breaker
This patch makes ZWSP (U+200B, zero width space) a potential line break in text layouts. This is a fix for bug 8501809. Change-Id: I18c1f8464e6c821ff75f819141bacc714a878700
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
-rw-r--r--core/java/android/text/StaticLayout.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index 90512853ca45..129127920904 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -340,7 +340,7 @@ public class StaticLayout extends Layout {
w += widths[j - paraStart];
}
- boolean isSpaceOrTab = c == CHAR_SPACE || c == CHAR_TAB;
+ boolean isSpaceOrTab = c == CHAR_SPACE || c == CHAR_TAB || c == CHAR_ZWSP;
if (w <= width || isSpaceOrTab) {
fitWidth = w;
@@ -956,6 +956,7 @@ public class StaticLayout extends Layout {
private static final char CHAR_SPACE = ' ';
private static final char CHAR_SLASH = '/';
private static final char CHAR_HYPHEN = '-';
+ private static final char CHAR_ZWSP = '\u200B';
private static final double EXTRA_ROUNDING = 0.5;