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

Commit d4b8cad1 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 077c79cb: am 03876c90: Fix text anchor fade-out positioning 

Merge commit '077c79cb'

* commit '077c79cb':
  Fix text anchor fade-out positioning
parents ef29bb5b 077c79cb

core/java/android/widget/TextView.java

+4 −5
Original line number Original line Diff line number Diff line
@@ -7807,19 +7807,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            final int compoundPaddingRight = getCompoundPaddingRight();

            final int compoundPaddingRight = getCompoundPaddingRight();





            final TextView hostView = TextView.this;

            final TextView hostView = TextView.this;

            final int handleWidth = mDrawable.getIntrinsicWidth();

            final int left = 0;

            final int left = 0;

            final int right = hostView.getWidth();

            final int right = hostView.getWidth();

            final int top = 0;

            final int top = 0;

            final int bottom = hostView.getHeight();

            final int bottom = hostView.getHeight();





            final int clipLeft = left + compoundPaddingLeft - (int) (handleWidth * 0.75f);

            final int clipLeft = left + compoundPaddingLeft;

            final int clipTop = top + extendedPaddingTop;

            final int clipTop = top + extendedPaddingTop;

            final int clipRight = right - compoundPaddingRight + (int) (handleWidth * 0.25f);

            final int clipRight = right - compoundPaddingRight;

            final int clipBottom = bottom - extendedPaddingBottom;

            final int clipBottom = bottom - extendedPaddingBottom;





            return mPositionX >= clipLeft && mPositionX <= clipRight &&

            return mPositionX + mHotspotX >= clipLeft && mPositionX + mHotspotX <= clipRight &&

                    mPositionY >= clipTop && mPositionY <= clipBottom;

                    mPositionY + mHotspotY >= clipTop && mPositionY + mHotspotY <= clipBottom;

        }

        }





        private void moveTo(int x, int y) {

        private void moveTo(int x, int y) {