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

Merge "Move isInvalidCordinates() method to Constants class"

main
Tadashi G. Takaoka 2012-10-31 21:24:00 -07:00 committed by Android (Google) Code Review
parent d80286642a 24ab8055aa
commit ffb0c093d1
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/keyboard/KeyboardActionListener.java
View File

@ -112,13 +112,5 @@ public interface KeyboardActionListener {
public boolean onCustomRequest(int requestCode) { public boolean onCustomRequest(int requestCode) {
return false; return false;
} }
// TODO: Remove this method when the vertical correction is removed.
public static boolean isInvalidCoordinate(final int coordinate) {
// Detect {@link Constants#NOT_A_COORDINATE},
// {@link Constants#SUGGESTION_STRIP_COORDINATE}, and
// {@link Constants#SPELL_CHECKER_COORDINATE}.
return coordinate < 0;
}
} }
} }

7
java/src/com/android/inputmethod/latin/Constants.java
View File

@ -136,11 +136,16 @@ public final class Constants {
public static final int NOT_A_CODE = -1; public static final int NOT_A_CODE = -1;
// See {@link KeyboardActionListener.Adapter#isInvalidCoordinate(int)}.
public static final int NOT_A_COORDINATE = -1; public static final int NOT_A_COORDINATE = -1;
public static final int SUGGESTION_STRIP_COORDINATE = -2; public static final int SUGGESTION_STRIP_COORDINATE = -2;
public static final int SPELL_CHECKER_COORDINATE = -3; public static final int SPELL_CHECKER_COORDINATE = -3;
public static boolean isValidCoordinate(final int coordinate) {
// Detect {@link NOT_A_COORDINATE}, {@link SUGGESTION_STRIP_COORDINATE},
// and {@link SPELL_CHECKER_COORDINATE}.
return coordinate >= 0;
}
/** /**
* Some common keys code. Must be positive. * Some common keys code. Must be positive.
*/ */

9
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1741,15 +1741,14 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
} }
if (isComposingWord) { if (isComposingWord) {
final int keyX, keyY; final int keyX, keyY;
if (KeyboardActionListener.Adapter.isInvalidCoordinate(x) if (Constants.isValidCoordinate(x) && Constants.isValidCoordinate(y)) {
|| KeyboardActionListener.Adapter.isInvalidCoordinate(y)) {
keyX = x;
keyY = y;
} else {
final KeyDetector keyDetector = final KeyDetector keyDetector =
mKeyboardSwitcher.getMainKeyboardView().getKeyDetector(); mKeyboardSwitcher.getMainKeyboardView().getKeyDetector();
keyX = keyDetector.getTouchX(x); keyX = keyDetector.getTouchX(x);
keyY = keyDetector.getTouchY(y); keyY = keyDetector.getTouchY(y);
} else {
keyX = x;
keyY = y;
} }
mWordComposer.add(primaryCode, keyX, keyY); mWordComposer.add(primaryCode, keyX, keyY);
// If it's the first letter, make note of auto-caps state // If it's the first letter, make note of auto-caps state