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

resolved conflicts for merge of ff545380 to master

Browse Source 
Change-Id: Ida3b6cec13b03d734bb1ba4e31554eb5226da749
This commit is contained in:
Gilles Debunne
2010-09-09 14:07:56 -07:00
parent 1560473ec1 ff54538096
commit 6eea4cd187
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5819,18 +5819,25 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
private void convertFromViewportToContentCoordinates(Rect r) {
int paddingTop = getExtendedPaddingTop();
final int horizontalOffset = viewportToContentHorizontalOffset();
r.left += horizontalOffset;
r.right += horizontalOffset;
final int verticalOffset = viewportToContentVerticalOffset();
r.top += verticalOffset;
r.bottom += verticalOffset;
}
private int viewportToContentHorizontalOffset() {
return getCompoundPaddingLeft() - mScrollX;
}
private int viewportToContentVerticalOffset() {
int offset = getExtendedPaddingTop() - mScrollY;
if ((mGravity & Gravity.VERTICAL_GRAVITY_MASK) != Gravity.TOP) {
paddingTop += getVerticalOffset(false);
offset += getVerticalOffset(false);
}
r.top += paddingTop;
r.bottom += paddingTop;
int paddingLeft = getCompoundPaddingLeft();
r.left += paddingLeft;
r.right += paddingLeft;
r.offset(-mScrollX, -mScrollY);
return offset;
}
@Override
@@ -7736,9 +7743,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
bounds.right = bounds.left + drawableWidth;
bounds.bottom = bounds.top + drawableHeight;
int boundTopBefore = bounds.top;
convertFromViewportToContentCoordinates(bounds);
mHotSpotVerticalPosition += bounds.top - boundTopBefore;
mDrawable.setBounds(bounds);
postInvalidate();
}
@@ -7882,6 +7887,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mOffsetX = (bounds.left + bounds.right) / 2.0f - x;
mOffsetY = mHandle.mHotSpotVerticalPosition - y;
mOffsetX += viewportToContentHorizontalOffset();
mOffsetY += viewportToContentVerticalOffset();
mOnDownTimerStart = event.getEventTime();
}
break;
@@ -8069,6 +8077,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mOffsetX = (bounds.left + bounds.right) / 2.0f - x;
mOffsetY = draggedHandle.mHotSpotVerticalPosition - y;
mOffsetX += viewportToContentHorizontalOffset();
mOffsetY += viewportToContentVerticalOffset();
((ArrowKeyMovementMethod)mMovement).setCursorController(this);
}
}