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

Commit 686e0545 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

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

Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d am: 361f03c4
am: 3e7177f9

* commit '3e7177f9':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: Ic21d60a789a0361ffca8362621fa03ded8d96ae5
parents b21f6918 3e7177f9

core/java/android/widget/TextView.java

+6 −7
Original line number Diff line number Diff line
@@ -6855,11 +6855,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();

            }
@@ -6946,12 +6946,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();