Merge "[IL73] Remove all refs to Key and Keyboard in WordComposer"

This commit is contained in:
Jean Chalard 2014-01-24 01:55:54 +00:00 committed by Android (Google) Code Review
commit 0c72529088

View file

@ -16,9 +16,6 @@
package com.android.inputmethod.latin;
import com.android.inputmethod.annotations.UsedForTesting;
import com.android.inputmethod.keyboard.Key;
import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.latin.utils.CoordinateUtils;
import com.android.inputmethod.latin.utils.StringUtils;
@ -275,24 +272,6 @@ public final class WordComposer {
}
}
/**
* Add a dummy key by retrieving reasonable coordinates
*/
// TODO: make this private or remove it entirely. Right now it's used in the tests
@UsedForTesting
public void addKeyInfo(final int codePoint, final Keyboard keyboard) {
final int x, y;
final Key key;
if (keyboard != null && (key = keyboard.getKey(codePoint)) != null) {
x = key.getX() + key.getWidth() / 2;
y = key.getY() + key.getHeight() / 2;
} else {
x = Constants.NOT_A_COORDINATE;
y = Constants.NOT_A_COORDINATE;
}
add(codePoint, x, y);
}
/**
* Set the currently composing word to the one passed as an argument.
* This will register NOT_A_COORDINATE for X and Ys, and use the passed keyboard for proximity.