Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 03876c90: Fix text anchor fade-out positioning

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

* commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab':
  Fix text anchor fade-out positioning
This commit is contained in:
Adam Powell
2010-10-02 17:49:07 -07:00
committed by Android Git Automerger
parent 0d843dc479 03876c905f
commit 077c79cb43
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/TextView.java
View File

@@ -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) {