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

Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev

Browse Source
This commit is contained in:
Raph Levien
2014-12-04 22:33:07 +00:00
committed by Android (Google) Code Review
parent d601c6c5c3 0e3c5e8272
commit 2f0e6f0c7f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,7 +416,11 @@ public class StaticLayout extends Layout {
currentTextWidth = widths[here - paraStart]; currentTextWidth = widths[here - paraStart];
} }
v = out(source, here, endPos, int ellipseEnd = endPos;
if (mMaximumVisibleLineCount == 1 && ellipsize == TextUtils.TruncateAt.MIDDLE) {
ellipseEnd = paraEnd;
}
v = out(source, here, ellipseEnd,
above, below, top, bottom, above, below, top, bottom,
v, spacingmult, spacingadd, chooseHt,chooseHtv, fm, hasTabOrEmoji, v, spacingmult, spacingadd, chooseHt,chooseHtv, fm, hasTabOrEmoji,
needMultiply, chdirs, dir, easy, bufEnd, includepad, trackpad, needMultiply, chdirs, dir, easy, bufEnd, includepad, trackpad,
@@ -704,7 +708,7 @@ public class StaticLayout extends Layout {
int left = 0, right = len; int left = 0, right = len;
float ravail = (avail - ellipsisWidth) / 2; float ravail = (avail - ellipsisWidth) / 2;
for (right = len; right >= 0; right--) { for (right = len; right > 0; right--) {
float w = widths[right - 1 + lineStart - widthStart]; float w = widths[right - 1 + lineStart - widthStart];
if (w + rsum > ravail) { if (w + rsum > ravail) {