Tuning gesture detection parameters (7a17c1fc) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@
		<integer name="config_gesture_dynamic_time_threshold_to">20</integer>
		<!-- Distance based threshold values for gesture detection (keyWidth%/sec) -->
		<fraction name="config_gesture_dynamic_distance_threshold_from">600%</fraction>
		<fraction name="config_gesture_dynamic_distance_threshold_to">35%</fraction>
		<fraction name="config_gesture_dynamic_distance_threshold_to">50%</fraction>
		<!-- Parameter for gesture sampling (keyWidth%/sec) -->
		<fraction name="config_gesture_sampling_minimum_distance">16.6666%</fraction>
		<!-- Parameters for gesture recognition (msec) and (keyWidth%/sec) -->

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

+18 −31

Original line number	Diff line number	Diff line
		@@ -192,47 +192,32 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
		gestureStrokeParams.mStaticTimeThresholdAfterFastTyping;
		}

		private void recordTyping(final long eventTime) {
		mLastTypingTime = eventTime;
		}

		private void recordLetterTyping(final long eventTime) {
		mLastLetterTypingTime = eventTime;
		// Reset gesture typing time
		mLastBatchInputTime = 0;
		}

		private void recordGestureTyping(final long eventTime) {
		mLastBatchInputTime = eventTime;
		// Reset typing time.
		mLastTypingTime = 0;
		}

		private boolean isInTyping() {
		return mLastTypingTime != 0;
		}

		private boolean isInBatchInput() {
		return mLastBatchInputTime != 0;
		private boolean wasLastInputTyping() {
		return mLastTypingTime >= mLastBatchInputTime;
		}

		public void onCodeInput(final int code, final long eventTime) {
		if (Keyboard.isLetterCode(code) && code != Keyboard.CODE_SPACE) {
		if (isInTyping()
		&& eventTime - mLastTypingTime < mStaticTimeThresholdAfterFastTyping) {
		recordLetterTyping(eventTime);
		// Record the letter typing time when
		// 1. Letter keys are typed successively without any batch input in between.
		// 2. A letter key is typed within the threshold time since the last any key typing.
		// 3. A non-letter key is typed within the threshold time since the last letter key
		// typing.
		if (Character.isLetter(code)) {
		if (wasLastInputTyping()
		\|\| eventTime - mLastTypingTime < mStaticTimeThresholdAfterFastTyping) {
		mLastLetterTypingTime = eventTime;
		}
		} else {
		if (eventTime - mLastLetterTypingTime < mStaticTimeThresholdAfterFastTyping) {
		// This non-letter typing should be treated as a part of fast typing.
		recordLetterTyping(eventTime);
		mLastLetterTypingTime = eventTime;
		}
		}
		recordTyping(eventTime);
		mLastTypingTime = eventTime;
		}

		public void onEndBatchInput(final long eventTime) {
		recordGestureTyping(eventTime);
		mLastBatchInputTime = eventTime;
		}

		public long getLastLetterTypingTime() {
		@@ -240,7 +225,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
		}

		public boolean needsToSuppressKeyPreviewPopup(final long eventTime) {
		return !isInTyping() && isInBatchInput()
		return !wasLastInputTyping()
		&& eventTime - mLastBatchInputTime < mSuppressKeyPreviewAfterBatchInputDuration;
		}
		}
		@@ -851,11 +836,13 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
		// Register move event on gesture tracker.
		onGestureMoveEvent(x, y, eventTime, true /* isMajorEvent */, key);
		if (sInGesture) {
		mTimerProxy.cancelLongPressTimer();
		mCurrentKey = null;
		setReleasedKeyGraphics(oldKey);
		return;
		}
		if (mGestureStrokeWithPreviewPoints.hasDetectedFastMove()) {
		mTimerProxy.cancelLongPressTimer();
		}
		}

		if (key != null) {

java/src/com/android/inputmethod/keyboard/internal/GestureStroke.java

+12 −5

Original line number	Diff line number	Diff line
		@@ -190,8 +190,8 @@ public class GestureStroke {
		return mParams.mDynamicTimeThresholdFrom - decayedThreshold;
		}

		public boolean isStartOfAGesture() {
		if (mDetectFastMoveTime == 0) {
		public final boolean isStartOfAGesture() {
		if (!hasDetectedFastMove()) {
		return false;
		}
		final int size = mEventTimes.getLength();
		@@ -200,6 +200,9 @@ public class GestureStroke {
		}
		final int lastIndex = size - 1;
		final int deltaTime = mEventTimes.get(lastIndex) - mDetectFastMoveTime;
		if (deltaTime < 0) {
		return false;
		}
		final int deltaDistance = getDistance(
		mXCoordinates.get(lastIndex), mYCoordinates.get(lastIndex),
		mDetectFastMoveX, mDetectFastMoveY);
		@@ -240,6 +243,10 @@ public class GestureStroke {
		mLastMajorEventY = y;
		}

		public final boolean hasDetectedFastMove() {
		return mDetectFastMoveTime > 0;
		}

		private int detectFastMove(final int x, final int y, final int time) {
		final int size = mEventTimes.getLength();
		final int lastIndex = size - 1;
		@@ -255,7 +262,7 @@ public class GestureStroke {
		Log.d(TAG, String.format("[%d] detectFastMove: speed=%5.2f", mPointerId, speed));
		}
		// Equivalent to (pixels / msecs < mStartSpeedThreshold / MSEC_PER_SEC)
		if (mDetectFastMoveTime == 0 && pixelsPerSec > mDetectFastMoveSpeedThreshold * msecs) {
		if (!hasDetectedFastMove() && pixelsPerSec > mDetectFastMoveSpeedThreshold * msecs) {
		if (DEBUG) {
		final float speed = (float)pixelsPerSec / msecs / mKeyWidth;
		Log.d(TAG, String.format(
		@@ -306,11 +313,11 @@ public class GestureStroke {
		return currentTime > lastRecognitionTime + mParams.mRecognitionMinimumTime;
		}

		public void appendAllBatchPoints(final InputPointers out) {
		public final void appendAllBatchPoints(final InputPointers out) {
		appendBatchPoints(out, mEventTimes.getLength());
		}

		public void appendIncrementalBatchPoints(final InputPointers out) {
		public final void appendIncrementalBatchPoints(final InputPointers out) {
		appendBatchPoints(out, mIncrementalRecognitionSize);
		}