nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am ad78058a: Rename InputPointers.addPointer and ResizableIntArray.add 

* commit 'ad78058a93492d4f114c6a6eb56177be9231a9eb':
  Rename InputPointers.addPointer and ResizableIntArray.add
main
Tadashi G. Takaoka 2014-01-07 23:52:37 -08:00 committed by Android Git Automerger
parent 12f569ba95 ad78058a93
commit e1dfbbe886
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java/src/com/android/inputmethod/keyboard/internal/GestureStrokeDrawingPoints.java
View File

@ -157,19 +157,19 @@ public final class GestureStrokeDrawingPoints {
for (int i = 1; i < segments; i++) { for (int i = 1; i < segments; i++) {
final float t = i / (float)segments; final float t = i / (float)segments;
mInterpolator.interpolate(t); mInterpolator.interpolate(t);
eventTimes.add(d1, (int)(dt * t) + t1); eventTimes.addAt(d1, (int)(dt * t) + t1);
xCoords.add(d1, (int)mInterpolator.mInterpolatedX); xCoords.addAt(d1, (int)mInterpolator.mInterpolatedX);
yCoords.add(d1, (int)mInterpolator.mInterpolatedY); yCoords.addAt(d1, (int)mInterpolator.mInterpolatedY);
if (GestureTrailDrawingPoints.DEBUG_SHOW_POINTS) { if (GestureTrailDrawingPoints.DEBUG_SHOW_POINTS) {
types.add(d1, GestureTrailDrawingPoints.POINT_TYPE_INTERPOLATED); types.addAt(d1, GestureTrailDrawingPoints.POINT_TYPE_INTERPOLATED);
} }
d1++; d1++;
} }
eventTimes.add(d1, pt[p2]); eventTimes.addAt(d1, pt[p2]);
xCoords.add(d1, px[p2]); xCoords.addAt(d1, px[p2]);
yCoords.add(d1, py[p2]); yCoords.addAt(d1, py[p2]);
if (GestureTrailDrawingPoints.DEBUG_SHOW_POINTS) { if (GestureTrailDrawingPoints.DEBUG_SHOW_POINTS) {
types.add(d1, GestureTrailDrawingPoints.POINT_TYPE_SAMPLED); types.addAt(d1, GestureTrailDrawingPoints.POINT_TYPE_SAMPLED);
} }
} }
return lastInterpolatedDrawIndex; return lastInterpolatedDrawIndex;

11
java/src/com/android/inputmethod/latin/InputPointers.java
View File

@ -55,15 +55,14 @@ public final class InputPointers {
mTimes.fill(lastTime, fromIndex, fillLength); mTimes.fill(lastTime, fromIndex, fillLength);
} }
// TODO: Rename this method to addPointerAt public void addPointerAt(int index, int x, int y, int pointerId, int time) {
public void addPointer(int index, int x, int y, int pointerId, int time) { mXCoordinates.addAt(index, x);
mXCoordinates.add(index, x); mYCoordinates.addAt(index, y);
mYCoordinates.add(index, y); mPointerIds.addAt(index, pointerId);
mPointerIds.add(index, pointerId);
if (LatinImeLogger.sDBG || DEBUG_TIME) { if (LatinImeLogger.sDBG || DEBUG_TIME) {
fillWithLastTimeUntil(index); fillWithLastTimeUntil(index);
} }
mTimes.add(index, time); mTimes.addAt(index, time);
} }
@UsedForTesting @UsedForTesting

2
java/src/com/android/inputmethod/latin/WordComposer.java
View File

@ -186,7 +186,7 @@ public final class WordComposer {
// (See {@link #setBatchInputWord}). // (See {@link #setBatchInputWord}).
if (!mIsBatchMode) { if (!mIsBatchMode) {
// TODO: Set correct pointer id and time // TODO: Set correct pointer id and time
mInputPointers.addPointer(newIndex, keyX, keyY, 0, 0); mInputPointers.addPointerAt(newIndex, keyX, keyY, 0, 0);
} }
} }
mIsFirstCharCapitalized = isFirstCharCapitalized( mIsFirstCharCapitalized = isFirstCharCapitalized(

3
java/src/com/android/inputmethod/latin/utils/ResizableIntArray.java
View File

@ -34,8 +34,7 @@ public final class ResizableIntArray {
throw new ArrayIndexOutOfBoundsException("length=" + mLength + "; index=" + index); throw new ArrayIndexOutOfBoundsException("length=" + mLength + "; index=" + index);
} }
// TODO: Rename this method to addAt. public void addAt(final int index, final int val) {
public void add(final int index, final int val) {
if (index < mLength) { if (index < mLength) {
mArray[index] = val; mArray[index] = val;
} else { } else {

2
tests/src/com/android/inputmethod/latin/InputPointersTests.java
View File

@ -82,7 +82,7 @@ public class InputPointersTests extends AndroidTestCase {
final int y = i * 2; final int y = i * 2;
final int pointerId = i * 3; final int pointerId = i * 3;
final int time = i * 4; final int time = i * 4;
src.addPointer(i, x, y, pointerId, time); src.addPointerAt(i, x, y, pointerId, time);
assertEquals("size after add at " + i, i + 1, src.getPointerSize()); assertEquals("size after add at " + i, i + 1, src.getPointerSize());
} }
for (int i = 0; i < limit; i += step) { for (int i = 0; i < limit; i += step) {

6
tests/src/com/android/inputmethod/latin/utils/ResizableIntArrayTests.java
View File

@ -67,7 +67,7 @@ public class ResizableIntArrayTests extends AndroidTestCase {
final int limit = DEFAULT_CAPACITY * 10, step = DEFAULT_CAPACITY * 2; final int limit = DEFAULT_CAPACITY * 10, step = DEFAULT_CAPACITY * 2;
for (int i = 0; i < limit; i += step) { for (int i = 0; i < limit; i += step) {
final int value = i; final int value = i;
src.add(i, value); src.addAt(i, value);
assertEquals("length after add at " + i, i + 1, src.getLength()); assertEquals("length after add at " + i, i + 1, src.getLength());
} }
for (int i = 0; i < limit; i += step) { for (int i = 0; i < limit; i += step) {
@ -93,7 +93,7 @@ public class ResizableIntArrayTests extends AndroidTestCase {
final int index = DEFAULT_CAPACITY / 2; final int index = DEFAULT_CAPACITY / 2;
final int valueAddAt = 100; final int valueAddAt = 100;
src.add(index, valueAddAt); src.addAt(index, valueAddAt);
assertEquals("legth after add at " + index, index + 1, src.getLength()); assertEquals("legth after add at " + index, index + 1, src.getLength());
assertEquals("value after add at " + index, valueAddAt, src.get(index)); assertEquals("value after add at " + index, valueAddAt, src.get(index));
assertEquals("value after add at 0", 0, src.get(0)); assertEquals("value after add at 0", 0, src.get(0));
@ -365,7 +365,7 @@ public class ResizableIntArrayTests extends AndroidTestCase {
final int shiftAmount = 20; final int shiftAmount = 20;
for (int i = 0; i < limit; ++i) { for (int i = 0; i < limit; ++i) {
final int value = i; final int value = i;
src.add(i, value); src.addAt(i, value);
assertEquals("length after add at " + i, i + 1, src.getLength()); assertEquals("length after add at " + i, i + 1, src.getLength());
} }
src.shift(shiftAmount); src.shift(shiftAmount);