Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c02e831 authored by Raph Levien's avatar Raph Levien
Browse files

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

This reverts commit 93e48e8c.

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

Bug: 18576264
parent b16be070

core/java/android/text/StaticLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -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