Merge "Fixes around text selection" (26b5cf40) · Commits · e / os / android_frameworks_base

core/java/android/text/method/ArrowKeyMovementMethod.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -232,8 +232,7 @@ public class ArrowKeyMovementMethod extends BaseMovementMethod implements Moveme

		if (widget.isFocused() && !widget.didTouchFocusSelect()) {
		if (action == MotionEvent.ACTION_DOWN) {
		boolean cap = isSelecting(buffer);
		if (cap) {
		if (isSelecting(buffer)) {
		int offset = widget.getOffsetForPosition(event.getX(), event.getY());

		buffer.setSpan(LAST_TAP_DOWN, offset, offset, Spannable.SPAN_POINT_POINT);
		@@ -245,9 +244,7 @@ public class ArrowKeyMovementMethod extends BaseMovementMethod implements Moveme
		widget.getParent().requestDisallowInterceptTouchEvent(true);
		}
		} else if (action == MotionEvent.ACTION_MOVE) {
		boolean cap = isSelecting(buffer);

		if (cap && handled) {
		if (isSelecting(buffer) && handled) {
		// Before selecting, make sure we've moved out of the "slop".
		// handled will be true, if we're in select mode AND we're
		// OUT of the slop
		@@ -279,7 +276,7 @@ public class ArrowKeyMovementMethod extends BaseMovementMethod implements Moveme
		if (isSelecting(buffer)) {
		buffer.removeSpan(LAST_TAP_DOWN);
		Selection.extendSelection(buffer, offset);
		} else {
		} else if (!widget.shouldIgnoreActionUpEvent()) {
		Selection.setSelection(buffer, offset);
		}

core/java/android/text/method/Touch.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -147,12 +147,10 @@ public class Touch {
		int nx = widget.getScrollX() + (int) dx;
		int ny = widget.getScrollY() + (int) dy;

		int padding = widget.getTotalPaddingTop() +
		widget.getTotalPaddingBottom();
		int padding = widget.getTotalPaddingTop() + widget.getTotalPaddingBottom();
		Layout layout = widget.getLayout();

		ny = Math.min(ny, layout.getHeight() - (widget.getHeight() -
		padding));
		ny = Math.min(ny, layout.getHeight() - (widget.getHeight() - padding));
		ny = Math.max(ny, 0);

		int oldX = widget.getScrollX();
		@@ -161,8 +159,7 @@ public class Touch {
		scrollTo(widget, layout, nx, ny);

		// If we actually scrolled, then cancel the up action.
		if (oldX != widget.getScrollX()
		\|\| oldY != widget.getScrollY()) {
		if (oldX != widget.getScrollX() \|\| oldY != widget.getScrollY()) {
		widget.cancelLongPress();
		}

core/java/android/widget/TextView.java

+25 −17

Original line number	Diff line number	Diff line
		@@ -8243,8 +8243,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return superResult;
		}

		final boolean touchIsFinished = action == MotionEvent.ACTION_UP && !mIgnoreActionUpEvent &&
		isFocused();
		final boolean touchIsFinished = (action == MotionEvent.ACTION_UP) &&
		!shouldIgnoreActionUpEvent() && isFocused();

		if ((mMovement != null \|\| onCheckIsTextEditor()) && isEnabled()
		&& mText instanceof Spannable && mLayout != null) {
		@@ -8254,9 +8254,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		handled \|= mMovement.onTouchEvent(this, (Spannable) mText, event);
		}

		if (mLinksClickable && mAutoLinkMask != 0 && mTextIsSelectable && touchIsFinished) {
		if (touchIsFinished && mLinksClickable && mAutoLinkMask != 0 && mTextIsSelectable) {
		// The LinkMovementMethod which should handle taps on links has not been installed
		// to support text selection. We reproduce its behavior here to open links.
		// on non editable text that support text selection.
		// We reproduce its behavior here to open links for these.
		ClickableSpan[] links = ((Spannable) mText).getSpans(getSelectionStart(),
		getSelectionEnd(), ClickableSpan.class);

		@@ -8266,7 +8267,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}

		if ((isTextEditable() \|\| mTextIsSelectable) && touchIsFinished) {
		if (touchIsFinished && (isTextEditable() \|\| mTextIsSelectable)) {
		// Show the IME, except when selecting in read-only text.
		final InputMethodManager imm = InputMethodManager.peekInstance();
		if (imm != null) {
		@@ -8277,9 +8278,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		boolean selectAllGotFocus = mSelectAllOnFocus && didTouchFocusSelect();
		if (!selectAllGotFocus && hasSelection()) {
		startSelectionActionMode();
		} else {
		hideControllers();
		if (!selectAllGotFocus && mText.length() > 0) {
		if (isCursorInsideEasyCorrectionSpan()) {
		@@ -8288,7 +8286,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		getInsertionController().show();
		}
		}
		}

		handled = true;
		}
		@@ -8399,6 +8396,17 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		mIgnoreActionUpEvent = true;
		}

		/**
		* This method is only valid during a touch event.
		*
		* @return true when the ACTION_UP event should be ignored, false otherwise.
		*
		* @hide
		*/
		public boolean shouldIgnoreActionUpEvent() {
		return mIgnoreActionUpEvent;
		}

		@Override
		public boolean onTrackballEvent(MotionEvent event) {
		if (mMovement != null && mText instanceof Spannable &&