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

Commit bf0a4e1d authored by Andrei Stingaceanu's avatar Andrei Stingaceanu Committed by android-build-merger
Browse files

Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev 

am: 2ed861d5

Change-Id: I0097c1a6ab90fe1e9085c36b2777a708ea616403
parents 178fe0d0 2ed861d5

core/java/android/widget/TextView.java

+4 −2
Original line number Diff line number Diff line
@@ -8196,9 +8196,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        mTempTextPaint.set(getPaint());

        mTempTextPaint.setTextSize(suggestedSizeInPx);



        final int availableWidth = mHorizontallyScrolling

                ? VERY_WIDE

                : getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight();

        final StaticLayout.Builder layoutBuilder = StaticLayout.Builder.obtain(

                text, 0, text.length(),  mTempTextPaint,

                getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight());

                text, 0, text.length(),  mTempTextPaint, availableWidth);



        layoutBuilder.setAlignment(getLayoutAlignment())

                .setLineSpacing(getLineSpacingExtra(), getLineSpacingMultiplier())