Revert "Fix missing ellipsis when just one character is truncated"

This reverts commit 93e48e8cf1.

The existing code in master already worked correctly for the original
problem, and this change just introduced a new problem.

Bug: 18576264
This commit is contained in:
Raph Levien
2014-12-12 11:17:01 -08:00
parent b16be0706b
commit 4c02e83172

View File

@@ -354,12 +354,14 @@ public class StaticLayout extends Layout {
while (breakIndex < breakCount && paraStart + breaks[breakIndex] <= spanEnd) {
int endPos = paraStart + breaks[breakIndex];
boolean moreChars = (endPos < paraEnd); // XXX is this the right way to calculate this?
v = out(source, here, endPos,
fmAscent, fmDescent, fmTop, fmBottom,
v, spacingmult, spacingadd, chooseHt,chooseHtv, fm, flags[breakIndex],
needMultiply, chdirs, dir, easy, bufEnd, includepad, trackpad,
chs, widths, paraStart, ellipsize, ellipsizedWidth,
lineWidths[breakIndex], paint, true);
lineWidths[breakIndex], paint, moreChars);
if (endPos < spanEnd) {
// preserve metrics for current span