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

Commit f4a3f3a0 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Fix: Ellipsis is wrongly applied or not applied in TextView. 

In current implementation, ellipsis is applied after
coptuting line breaks without limiting line count. As a
result, ellipsis can be skipped or- wrongly applied because
the breaks are computed to fit with the width.
With this change, the last line and overflowed part are
treated as a single line when the number of breaks exceeds
the remaining line count.

Bug: 6615676
Bug: 18514378
Bug: 20177499

Change-Id: I1d90e299404960cdd22746bad572411b119f7360
parent 4ba81a08

core/java/android/text/StaticLayout.java

+21 −0
Original line number Diff line number Diff line
@@ -714,6 +714,27 @@ public class StaticLayout extends Layout { 
            float[] lineWidths = lineBreaks.widths;

            int[] flags = lineBreaks.flags;



            final int remainingLineCount = mMaximumVisibleLineCount - mLineCount;

            final boolean ellipsisMayBeApplied = ellipsize != null

                    && (ellipsize == TextUtils.TruncateAt.END

                        || (mMaximumVisibleLineCount == 1

                                && ellipsize != TextUtils.TruncateAt.MARQUEE));

            if (remainingLineCount < breakCount && ellipsisMayBeApplied) {

                // Treat the last line and overflowed lines as a single line.

                breaks[remainingLineCount - 1] = breaks[breakCount - 1];

                // Calculate width and flag.

                float width = 0;

                int flag = 0;

                for (int i = remainingLineCount - 1; i < breakCount; i++) {

                    width += lineWidths[i];

                    flag |= flags[i] & TAB_MASK;

                }

                lineWidths[remainingLineCount - 1] = width;

                flags[remainingLineCount - 1] = flag;



                breakCount = remainingLineCount;

            }



            // here is the offset of the starting character of the line we are currently measuring

            int here = paraStart;