Merge "Vibrate on long press, even out of text" (f17981b3) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -8141,24 +8141,26 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		@Override
		public boolean performLongClick() {
		boolean handled = false;
		boolean vibrate = true;

		if (super.performLongClick()) {
		handled = true;
		}

		if (mEditor == null) {
		return handled;
		}

		// Long press in empty space moves cursor and shows the Paste affordance if available.
		if (!handled && mEditor != null && !isPositionOnText(getEditor().mLastDownPositionX, getEditor().mLastDownPositionY) &&
		if (!handled && !isPositionOnText(getEditor().mLastDownPositionX, getEditor().mLastDownPositionY) &&
		getEditor().mInsertionControllerEnabled) {
		final int offset = getOffsetForPosition(getEditor().mLastDownPositionX, getEditor().mLastDownPositionY);
		stopSelectionActionMode();
		Selection.setSelection((Spannable) mText, offset);
		getInsertionController().showWithActionPopup();
		handled = true;
		vibrate = false;
		}

		if (!handled && mEditor != null && getEditor().mSelectionActionMode != null) {
		if (!handled && getEditor().mSelectionActionMode != null) {
		if (touchPositionIsInSelection()) {
		// Start a drag
		final int start = getSelectionStart();
		@@ -8177,15 +8179,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		// Start a new selection
		if (!handled && mEditor != null) {
		vibrate = handled = startSelectionActionMode();
		if (!handled) {
		handled = startSelectionActionMode();
		}

		if (vibrate) {
		if (handled) {
		performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
		}

		if (handled && mEditor != null) {
		getEditor().mDiscardNextActionUp = true;
		}