Merge "TextView: start drag and drop when dragging selection by mouse." (dfea1a33) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+23 −9

Original line number	Diff line number	Diff line
		@@ -1082,6 +1082,20 @@ public class Editor {
		return true;
		}

		private void startDragAndDrop() {
		final int start = mTextView.getSelectionStart();
		final int end = mTextView.getSelectionEnd();
		CharSequence selectedText = mTextView.getTransformedText(start, end);
		ClipData data = ClipData.newPlainText(null, selectedText);
		DragLocalState localState = new DragLocalState(mTextView, start, end);
		mTextView.startDragAndDrop(data, getTextThumbnailBuilder(selectedText), localState,
		View.DRAG_FLAG_GLOBAL);
		stopTextActionMode();
		if (hasSelectionController()) {
		getSelectionController().resetTouchOffsets();
		}
		}

		public boolean performLongClick(boolean handled) {
		// Long press in empty space moves cursor and starts the insertion action mode.
		if (!handled && !isPositionOnText(mLastDownPositionX, mLastDownPositionY) &&
		@@ -1097,15 +1111,7 @@ public class Editor {

		if (!handled && mTextActionMode != null) {
		if (touchPositionIsInSelection()) {
		// Start a drag
		final int start = mTextView.getSelectionStart();
		final int end = mTextView.getSelectionEnd();
		CharSequence selectedText = mTextView.getTransformedText(start, end);
		ClipData data = ClipData.newPlainText(null, selectedText);
		DragLocalState localState = new DragLocalState(mTextView, start, end);
		mTextView.startDrag(data, getTextThumbnailBuilder(selectedText), localState,
		View.DRAG_FLAG_GLOBAL);
		stopTextActionMode();
		startDragAndDrop();
		} else {
		stopTextActionMode();
		selectCurrentWordAndStartDrag();
		@@ -4925,6 +4931,14 @@ public class Editor {

		if (isMouse && !isDragAcceleratorActive()) {
		final int offset = mTextView.getOffsetForPosition(eventX, eventY);
		if (mTextView.hasSelection()
		&& (!mHaventMovedEnoughToStartDrag \|\| mStartOffset != offset)
		&& offset >= mTextView.getSelectionStart()
		&& offset <= mTextView.getSelectionEnd()) {
		startDragAndDrop();
		break;
		}

		if (mStartOffset != offset) {
		// Start character based drag accelerator.
		if (mTextActionMode != null) {