Merge "Only take one pointer in caption MotionEvents." into udc-qpr-dev (6a6a5805) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -268,7 +268,10 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel {
		return false;
		}
		case MotionEvent.ACTION_MOVE: {
		int dragPointerIdx = e.findPointerIndex(mDragPointerId);
		if (e.findPointerIndex(mDragPointerId) == -1) {
		mDragPointerId = e.getPointerId(0);
		}
		final int dragPointerIdx = e.findPointerIndex(mDragPointerId);
		mDragPositioningCallback.onDragPositioningMove(
		e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx));
		mIsDragging = true;
		@@ -276,7 +279,10 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel {
		}
		case MotionEvent.ACTION_UP:
		case MotionEvent.ACTION_CANCEL: {
		int dragPointerIdx = e.findPointerIndex(mDragPointerId);
		if (e.findPointerIndex(mDragPointerId) == -1) {
		mDragPointerId = e.getPointerId(0);
		}
		final int dragPointerIdx = e.findPointerIndex(mDragPointerId);
		mDragPositioningCallback.onDragPositioningEnd(
		e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx));
		final boolean wasDragging = mIsDragging;

+6 −0

Original line number	Diff line number	Diff line
		@@ -385,6 +385,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		case MotionEvent.ACTION_MOVE: {
		final DesktopModeWindowDecoration decoration =
		mWindowDecorByTaskId.get(mTaskId);
		if (e.findPointerIndex(mDragPointerId) == -1) {
		mDragPointerId = e.getPointerId(0);
		}
		final int dragPointerIdx = e.findPointerIndex(mDragPointerId);
		mDesktopTasksController.ifPresent(c -> c.onDragPositioningMove(taskInfo,
		decoration.mTaskSurface, e.getRawY(dragPointerIdx)));
		@@ -395,6 +398,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		}
		case MotionEvent.ACTION_UP:
		case MotionEvent.ACTION_CANCEL: {
		if (e.findPointerIndex(mDragPointerId) == -1) {
		mDragPointerId = e.getPointerId(0);
		}
		final int dragPointerIdx = e.findPointerIndex(mDragPointerId);
		// Position of the task is calculated by subtracting the raw location of the
		// motion event (the location of the motion relative to the display) by the

+4 −1

Original line number	Diff line number	Diff line
		@@ -73,8 +73,11 @@ class DragDetector {
		return mResultOfDownAction;
		}
		case ACTION_MOVE: {
		if (ev.findPointerIndex(mDragPointerId) == -1) {
		mDragPointerId = ev.getPointerId(0);
		}
		final int dragPointerIndex = ev.findPointerIndex(mDragPointerId);
		if (!mIsDragEvent) {
		int dragPointerIndex = ev.findPointerIndex(mDragPointerId);
		float dx = ev.getRawX(dragPointerIndex) - mInputDownPoint.x;
		float dy = ev.getRawY(dragPointerIndex) - mInputDownPoint.y;
		// Touches generate noisy moves, so only once the move is past the touch