Merge "Starting measuring displacement from the edge of the slop zone" into main (35175503) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
		mSquaredTouchSlop = mDeviceState.getSquaredTouchSlop();

		mPassedPilferInputSlop = mPassedWindowMoveSlop = continuingPreviousGesture;
		mStartDisplacement = continuingPreviousGesture ? 0 : -mTouchSlop;
		mDisableHorizontalSwipe = !mPassedPilferInputSlop && disableHorizontalSwipe;
		mRotationTouchHelper = mDeviceState.getRotationTouchHelper();
		}
		@@ -280,7 +281,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
		if (mGestureState.isTrackpadGesture() \|\| Math.abs(displacement)
		> mTouchSlop) {
		mPassedWindowMoveSlop = true;
		mStartDisplacement = Math.min(displacement, -mTouchSlop);
		mStartDisplacement = -mTouchSlop;
		}
		}
		}
		@@ -336,7 +337,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
		}
		if (!mPassedWindowMoveSlop) {
		mPassedWindowMoveSlop = true;
		mStartDisplacement = Math.min(displacement, -mTouchSlop);
		mStartDisplacement = -mTouchSlop;
		}
		notifyGestureStarted(isLikelyToStartNewTask);
		}