Merge "Fix gesture detection when sliding key input is disabled" (e863fb71) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -794,13 +794,16 @@ public class PointerTracker {
		final int dx = x - lastX;
		final int dy = y - lastY;
		final int lastMoveSquared = dx * dx + dy * dy;
		// TODO: Should find a way to balance gesture detection and this hack.
		if (sNeedsPhantomSuddenMoveEventHack
		&& lastMoveSquared >= mKeyQuarterWidthSquared) {
		&& lastMoveSquared >= mKeyQuarterWidthSquared
		&& !mIsPossibleGesture) {
		if (DEBUG_MODE) {
		Log.w(TAG, String.format("onMoveEvent:"
		+ " phantom sudden move event is translated to "
		+ "up[%d,%d]/down[%d,%d] events", lastX, lastY, x, y));
		}
		// TODO: This should be moved to outside of this nested if-clause?
		if (ProductionFlag.IS_EXPERIMENTAL) {
		ResearchLogger.pointerTracker_onMoveEvent(x, y, lastX, lastY);
		}
		@@ -816,7 +819,9 @@ public class PointerTracker {
		&& !sPointerTrackerQueue.hasModifierKeyOlderThan(this)) {
		onUpEventInternal(x, y, eventTime);
		}
		if (!mIsPossibleGesture) {
		mKeyAlreadyProcessed = true;
		}
		setReleasedKeyGraphics(oldKey);
		}
		}
		@@ -832,11 +837,13 @@ public class PointerTracker {
		if (mIsAllowedSlidingKeyInput) {
		onMoveToNewKey(key, x, y);
		} else {
		if (!mIsPossibleGesture) {
		mKeyAlreadyProcessed = true;
		}
		}
		}
		}
		}

		public void onUpEvent(int x, int y, long eventTime) {
		if (DEBUG_EVENT)
		@@ -871,6 +878,7 @@ public class PointerTracker {
		private void onUpEventInternal(int x, int y, long eventTime) {
		mTimerProxy.cancelKeyTimers();
		mIsInSlidingKeyInput = false;
		mIsPossibleGesture = false;
		// Release the last pressed key.
		setReleasedKeyGraphics(mCurrentKey);
		if (mIsShowingMoreKeysPanel) {