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

Commit 92d0316d authored by Siyamed Sinir's avatar Siyamed Sinir Committed by Android (Google) Code Review
Browse files

Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev

parents 7f133035 24aba4b9

core/java/android/widget/TextView.java

+6 −7
Original line number Diff line number Diff line
@@ -6857,11 +6857,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                        .setLineSpacing(mSpacingAdd, mSpacingMult)

                        .setIncludePad(mIncludePad)

                        .setBreakStrategy(mBreakStrategy)

                        .setHyphenationFrequency(mHyphenationFrequency)

                        .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);

                        .setHyphenationFrequency(mHyphenationFrequency);

                if (shouldEllipsize) {

                    builder.setEllipsize(mEllipsize)

                            .setEllipsizedWidth(ellipsisWidth);

                            .setEllipsizedWidth(ellipsisWidth)

                            .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);

                }

                mHintLayout = builder.build();

            }
@@ -6948,12 +6948,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    .setLineSpacing(mSpacingAdd, mSpacingMult)

                    .setIncludePad(mIncludePad)

                    .setBreakStrategy(mBreakStrategy)

                    .setHyphenationFrequency(mHyphenationFrequency)

                    .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);

                    .setHyphenationFrequency(mHyphenationFrequency);

            if (shouldEllipsize) {

                builder.setEllipsize(effectiveEllipsize)

                        .setEllipsizedWidth(ellipsisWidth);



                        .setEllipsizedWidth(ellipsisWidth)

                        .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);

            }

            // TODO: explore always setting maxLines

            result = builder.build();