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

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

Merge "AutoSize TextView - fix measurements" into oc-dev am: e812e7dc 

am: de8aec39

Change-Id: I582265f2e0c19118a3759e4348fd693df26ac905
parents 151d60c6 de8aec39

core/java/android/widget/TextView.java

+22 −28
Original line number Diff line number Diff line
@@ -8148,11 +8148,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        mTempTextPaint.set(getPaint());

        mTempTextPaint.setTextSize(suggestedSizeInPx);



        if ((mLayout instanceof BoringLayout) && BoringLayout.isBoring(

                text, mTempTextPaint, getTextDirectionHeuristic(), mBoring) != null) {

            return mTempTextPaint.getFontSpacing() <= availableSpace.bottom

                    && mTempTextPaint.measureText(text, 0, text.length()) <= availableSpace.right;

        } else {

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

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

                getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight());
@@ -8177,7 +8172,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        if (layout.getHeight() > availableSpace.bottom) {

            return false;

        }

        }



        return true;

    }