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

Commit 8fdf3975 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

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

parents 969ac0b2 4c02e831

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