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

Commit a40b314a authored by Kyrylo Mikos's avatar Kyrylo Mikos Committed by Kiril Mikos
Browse files

Fix ellipsizing of emoji symbols in StatisLayout. 

Change-Id: Ia057053a7dd6e5a256499f6bded99872581de18e
parent c63b2a47

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) {