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

Commit dafe9d5e authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix ellipsizing of emoji symbols in StatisLayout." into cm-11.0

parents d0c8d621 a40b314a

core/java/android/text/StaticLayout.java

+7 −2
Original line number Diff line number Diff line
@@ -771,9 +771,14 @@ public class StaticLayout extends Layout { 
            ellipsisStart = i;

            ellipsisCount = len - i;

            if (forceEllipsis && ellipsisCount == 0 && len > 0) {

                ellipsisStart = len - 1;

                final char c = mMeasured.mChars[lineEnd - widthStart - 1];

                if (c >= CHAR_FIRST_HIGH_SURROGATE && c <= CHAR_LAST_LOW_SURROGATE) {

                    ellipsisCount = 2;

                } else {

                    ellipsisCount = 1;

                }

                ellipsisStart = len - ellipsisCount;

            }

        } else {

            // where = TextUtils.TruncateAt.MIDDLE We only support middle ellipsis on a single line

            if (mMaximumVisibleLineCount == 1) {