am 03876c90: Fix text anchor fade-out positioning

Merge commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab' into gingerbread-plus-aosp

* commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab':
  Fix text anchor fade-out positioning

1 files changed, 4 insertions, 5 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 75edfaa..c6f2754 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7725,19 +7725,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             final int compoundPaddingRight = getCompoundPaddingRight();
 
             final TextView hostView = TextView.this;
-            final int handleWidth = mDrawable.getIntrinsicWidth();
             final int left = 0;
             final int right = hostView.getWidth();
             final int top = 0;
             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 clipRight = right - compoundPaddingRight + (int) (handleWidth * 0.25f);
+            final int clipRight = right - compoundPaddingRight;
             final int clipBottom = bottom - extendedPaddingBottom;
 
-            return mPositionX >= clipLeft && mPositionX <= clipRight &&
-                    mPositionY >= clipTop && mPositionY <= clipBottom;
+            return mPositionX + mHotspotX >= clipLeft && mPositionX + mHotspotX <= clipRight &&
+                    mPositionY + mHotspotY >= clipTop && mPositionY + mHotspotY <= clipBottom;
         }
 
         private void moveTo(int x, int y) {