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

Commit 55fd45b2 authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

Reverse check for multi-character ellipsis 

Reverse a recently-introduced incorrect check for multi-character
ellipsis in Layout.java. The check was introduced in
Id1dfdc503f87fabed2447d55ab2107eee0eccd08.

Test: bit CtsTextTestCases:*
Test: bit FrameworksCoreTests:android.text.
Change-Id: I79198be0bd202a303f8db02a235c2af3b76abf32
parent 213791f7

core/java/android/text/Layout.java

+3 −1
Original line number Diff line number Diff line
@@ -2067,9 +2067,11 @@ public abstract class Layout { 


        final String ellipsisString = TextUtils.getEllipsisString(method);

        final int ellipsisStringLen = ellipsisString.length();

        // Use the ellipsis string only if there are that at least as many characters to replace.

        final boolean useEllipsisString = ellipsisCount >= ellipsisStringLen;

        for (int i = 0; i < ellipsisCount; i++) {

            final char c;

            if (i < ellipsisStringLen && ellipsisCount <= ellipsisStringLen) {

            if (useEllipsisString && i < ellipsisStringLen) {

                c = ellipsisString.charAt(i);

            } else {

                c = TextUtils.ELLIPSIS_FILLER;