Move InputPointers and ResizableIntArray to common (36799b2a) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/InputPointers.java→common/src/com/android/inputmethod/latin/common/InputPointers.java

+3 −35

Original line number	Diff line number	Diff line
		@@ -14,18 +14,12 @@
		* limitations under the License.
		*/

		package com.android.inputmethod.latin;

		import android.util.Log;
		import android.util.SparseIntArray;
		package com.android.inputmethod.latin.common;

		import com.android.inputmethod.annotations.UsedForTesting;
		import com.android.inputmethod.latin.define.DebugFlags;
		import com.android.inputmethod.latin.utils.ResizableIntArray;

		// TODO: This class is not thread-safe.
		public final class InputPointers {
		private static final String TAG = InputPointers.class.getSimpleName();
		private static final boolean DEBUG_TIME = false;

		private final int mDefaultCapacity;
		@@ -61,14 +55,14 @@ public final class InputPointers {
		mXCoordinates.addAt(index, x);
		mYCoordinates.addAt(index, y);
		mPointerIds.addAt(index, pointerId);
		if (DebugFlags.DEBUG_ENABLED \|\| DEBUG_TIME) {
		if (DEBUG_TIME) {
		fillWithLastTimeUntil(index);
		}
		mTimes.addAt(index, time);
		}

		@UsedForTesting
		void addPointer(int x, int y, int pointerId, int time) {
		public void addPointer(int x, int y, int pointerId, int time) {
		mXCoordinates.add(x);
		mYCoordinates.add(y);
		mPointerIds.add(pointerId);
		@@ -152,11 +146,6 @@ public final class InputPointers {
		* the sequence.
		*/
		public int[] getTimes() {
		if (DebugFlags.DEBUG_ENABLED \|\| DEBUG_TIME) {
		if (!isValidTimeStamps()) {
		throw new RuntimeException("Time stamps are invalid.");
		}
		}
		return mTimes.getPrimitiveArray();
		}

		@@ -165,25 +154,4 @@ public final class InputPointers {
		return "size=" + getPointerSize() + " id=" + mPointerIds + " time=" + mTimes
		+ " x=" + mXCoordinates + " y=" + mYCoordinates;
		}

		private boolean isValidTimeStamps() {
		final int[] times = mTimes.getPrimitiveArray();
		final int[] pointerIds = mPointerIds.getPrimitiveArray();
		final SparseIntArray lastTimeOfPointers = new SparseIntArray();
		final int size = getPointerSize();
		for (int i = 0; i < size; ++i) {
		final int pointerId = pointerIds[i];
		final int time = times[i];
		final int lastTime = lastTimeOfPointers.get(pointerId, time);
		if (time < lastTime) {
		// dump
		for (int j = 0; j < size; ++j) {
		Log.d(TAG, "--- (" + j + ") " + times[j]);
		}
		return false;
		}
		lastTimeOfPointers.put(pointerId, time);
		}
		return true;
		}
		}

java/src/com/android/inputmethod/latin/utils/ResizableIntArray.java→common/src/com/android/inputmethod/latin/common/ResizableIntArray.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.inputmethod.latin.utils;
		package com.android.inputmethod.latin.common;

		import java.util.Arrays;

java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ package com.android.inputmethod.latin.touchinputconsumer;
		import android.view.inputmethod.EditorInfo;

		import com.android.inputmethod.keyboard.Keyboard;
		import com.android.inputmethod.latin.InputPointers;
		import com.android.inputmethod.latin.SuggestedWords;
		import com.android.inputmethod.latin.common.InputPointers;
		import com.android.inputmethod.latin.inputlogic.PrivateCommandPerformer;

		import java.util.List;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package com.android.inputmethod.keyboard;

		import com.android.inputmethod.latin.InputPointers;
		import com.android.inputmethod.latin.common.Constants;
		import com.android.inputmethod.latin.common.InputPointers;

		public interface KeyboardActionListener {
		/**

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,9 +31,9 @@ import com.android.inputmethod.keyboard.internal.GestureStrokeDrawingPoints;
		import com.android.inputmethod.keyboard.internal.GestureStrokeRecognitionParams;
		import com.android.inputmethod.keyboard.internal.PointerTrackerQueue;
		import com.android.inputmethod.keyboard.internal.TypingTimeRecorder;
		import com.android.inputmethod.latin.InputPointers;
		import com.android.inputmethod.latin.R;
		import com.android.inputmethod.latin.common.Constants;
		import com.android.inputmethod.latin.common.InputPointers;
		import com.android.inputmethod.latin.define.DebugFlags;
		import com.android.inputmethod.latin.settings.Settings;
		import com.android.inputmethod.latin.utils.CoordinateUtils;