Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev

Browse Source 
* commit '8fed6bc894a993a195ebcb8e8772b725cd828f0d':
  Make zero width space a line breaker
This commit is contained in:
Raph Levien
2013-03-29 10:02:16 -07:00
committed by Android Git Automerger
parent d680287b42 8fed6bc894
commit 0a91410720
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/text/StaticLayout.java
View File

@@ -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;