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

am bd1cc1da: Fix bug that upper case mini-keyboard does not work 

Merge commit 'bd1cc1da005fe477bf28afce43d5572e381b4757' into gingerbread-plus-aosp

* commit 'bd1cc1da005fe477bf28afce43d5572e381b4757':
  Fix bug that upper case mini-keyboard does not work
main
Tadashi G. Takaoka 2010-09-15 07:43:08 -07:00 committed by Android Git Automerger
parent b36a653ca6 bd1cc1da00
commit 4b813f56bb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/MiniKeyboardKeyDetector.java
View File

@ -41,19 +41,19 @@ class MiniKeyboardKeyDetector extends KeyDetector {
final Key[] keys = getKeys(); final Key[] keys = getKeys();
final int touchX = getTouchX(x); final int touchX = getTouchX(x);
final int touchY = getTouchY(y); final int touchY = getTouchY(y);
int closestKey = LatinKeyboardBaseView.NOT_A_KEY; int closestKeyIndex = LatinKeyboardBaseView.NOT_A_KEY;
int closestKeyDist = (y < 0) ? mSlideAllowanceSquareTop : mSlideAllowanceSquare; int closestKeyDist = (y < 0) ? mSlideAllowanceSquareTop : mSlideAllowanceSquare;
final int keyCount = keys.length; final int keyCount = keys.length;
for (int i = 0; i < keyCount; i++) { for (int i = 0; i < keyCount; i++) {
final Key key = keys[i]; final Key key = keys[i];
int dist = key.squaredDistanceFrom(touchX, touchY); int dist = key.squaredDistanceFrom(touchX, touchY);
if (dist < closestKeyDist) { if (dist < closestKeyDist) {
closestKey = i; closestKeyIndex = i;
closestKeyDist = dist; closestKeyDist = dist;
} }
} }
if (allKeys != null && closestKey != LatinKeyboardBaseView.NOT_A_KEY) if (allKeys != null && closestKeyIndex != LatinKeyboardBaseView.NOT_A_KEY)
allKeys[0] = closestKey; allKeys[0] = keys[closestKeyIndex].codes[0];
return closestKey; return closestKeyIndex;
} }
} }