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

Commit 3c8d6aef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Improve ellipsize performance" into sc-dev am: 0bfbdaf6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14905092

Change-Id: Ia1358b8ab37609f5c454569c9b9878fb72b38b2e
parents 362a8ab3 0bfbdaf6

core/java/android/text/Layout.java

+5 −4
Original line number Diff line number Diff line
@@ -2351,7 +2351,10 @@ public abstract class Layout { 
        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 int min = Math.max(0, start - ellipsisStart - lineStart);

        final int max = Math.min(ellipsisCount, end - ellipsisStart - lineStart);



        for (int i = min; i < max; i++) {

            final char c;

            if (useEllipsisString && i < ellipsisStringLen) {

                c = ellipsisString.charAt(i);
@@ -2360,11 +2363,9 @@ public abstract class Layout { 
            }



            final int a = i + ellipsisStart + lineStart;

            if (start <= a && a < end) {

            dest[destoff + a - start] = c;

        }

    }

    }



    /**

     * Stores information about bidirectional (left-to-right or right-to-left)