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

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

Merge "Ellipsized and Non-ellipsized baselines should be same." into nyc-dev

parents 5a21494d 715589fb

core/java/android/text/BoringLayout.java

+2 −6
Original line number Diff line number Diff line
@@ -189,12 +189,6 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 


        mBottom = spacing;



        if (includepad) {

            mDesc = spacing + metrics.top;

        } else {

            mDesc = spacing + metrics.ascent;

        }



        if (trustWidth) {

            mMax = metrics.width;

        } else {
@@ -214,6 +208,8 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 
            mTopPadding = metrics.top - metrics.ascent;

            mBottomPadding = metrics.bottom - metrics.descent;

        }



        mDesc = spacing + mBottomPadding + (includepad ? metrics.top : metrics.ascent);

    }



    /**

core/java/android/widget/TextView.java

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

                        .setIncludePad(mIncludePad)

                        .setBreakStrategy(mBreakStrategy)

                        .setHyphenationFrequency(mHyphenationFrequency);

                        .setHyphenationFrequency(mHyphenationFrequency)

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

                if (shouldEllipsize) {

                    builder.setEllipsize(mEllipsize)

                            .setEllipsizedWidth(ellipsisWidth)

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

                            .setEllipsizedWidth(ellipsisWidth);

                }

                mHintLayout = builder.build();

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

                    .setIncludePad(mIncludePad)

                    .setBreakStrategy(mBreakStrategy)

                    .setHyphenationFrequency(mHyphenationFrequency);

                    .setHyphenationFrequency(mHyphenationFrequency)

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

            if (shouldEllipsize) {

                builder.setEllipsize(effectiveEllipsize)

                        .setEllipsizedWidth(ellipsisWidth)

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

                        .setEllipsizedWidth(ellipsisWidth);



            }

            // TODO: explore always setting maxLines

            result = builder.build();