resolved conflicts for merge of ff545380 to master (6eea4cd1) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+23 −12

Original line number	Diff line number	Diff line
		@@ -5819,18 +5819,25 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		private void convertFromViewportToContentCoordinates(Rect r) {
		int paddingTop = getExtendedPaddingTop();
		if ((mGravity & Gravity.VERTICAL_GRAVITY_MASK) != Gravity.TOP) {
		paddingTop += getVerticalOffset(false);
		final int horizontalOffset = viewportToContentHorizontalOffset();
		r.left += horizontalOffset;
		r.right += horizontalOffset;

		final int verticalOffset = viewportToContentVerticalOffset();
		r.top += verticalOffset;
		r.bottom += verticalOffset;
		}
		r.top += paddingTop;
		r.bottom += paddingTop;

		int paddingLeft = getCompoundPaddingLeft();
		r.left += paddingLeft;
		r.right += paddingLeft;
		private int viewportToContentHorizontalOffset() {
		return getCompoundPaddingLeft() - mScrollX;
		}

		r.offset(-mScrollX, -mScrollY);
		private int viewportToContentVerticalOffset() {
		int offset = getExtendedPaddingTop() - mScrollY;
		if ((mGravity & Gravity.VERTICAL_GRAVITY_MASK) != Gravity.TOP) {
		offset += getVerticalOffset(false);
		}
		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);
		}
		}