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

Commit ed219c11 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #5979311 Change TextView to not clip top/bottom text"

parents 68c02e25 132bda1c

core/java/android/widget/TextView.java

+6 −2
Original line number Diff line number Diff line
@@ -4834,10 +4834,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        int extendedPaddingTop = getExtendedPaddingTop();

        int extendedPaddingBottom = getExtendedPaddingBottom();



        final int vspace = mBottom - mTop - compoundPaddingBottom - compoundPaddingTop;

        final int maxScrollY = mLayout.getHeight() - vspace;



        float clipLeft = compoundPaddingLeft + scrollX;

        float clipTop = extendedPaddingTop + scrollY;

        float clipTop = (scrollY == 0) ? 0 : extendedPaddingTop + scrollY;

        float clipRight = right - left - compoundPaddingRight + scrollX;

        float clipBottom = bottom - top - extendedPaddingBottom + scrollY;

        float clipBottom = bottom - top + scrollY -

                ((scrollY == maxScrollY) ? 0 : extendedPaddingBottom);



        if (mShadowRadius != 0) {

            clipLeft += Math.min(0, mShadowDx - mShadowRadius);