Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b813f56 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

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

Merge commit 'bd1cc1da' into gingerbread-plus-aosp

* commit 'bd1cc1da':
  Fix bug that upper case mini-keyboard does not work
parents b36a653c bd1cc1da

java/src/com/android/inputmethod/latin/MiniKeyboardKeyDetector.java

+5 −5
Original line number Diff line number Diff line
@@ -41,19 +41,19 @@ class MiniKeyboardKeyDetector extends KeyDetector { 
        final Key[] keys = getKeys();

        final int touchX = getTouchX(x);

        final int touchY = getTouchY(y);

        int closestKey = LatinKeyboardBaseView.NOT_A_KEY;

        int closestKeyIndex = LatinKeyboardBaseView.NOT_A_KEY;

        int closestKeyDist = (y < 0) ? mSlideAllowanceSquareTop : mSlideAllowanceSquare;

        final int keyCount = keys.length;

        for (int i = 0; i < keyCount; i++) {

            final Key key = keys[i];

            int dist = key.squaredDistanceFrom(touchX, touchY);

            if (dist < closestKeyDist) {

                closestKey = i;

                closestKeyIndex = i;

                closestKeyDist = dist;

            }

        }

        if (allKeys != null && closestKey != LatinKeyboardBaseView.NOT_A_KEY)

            allKeys[0] = closestKey;

        return closestKey;

        if (allKeys != null && closestKeyIndex != LatinKeyboardBaseView.NOT_A_KEY)

            allKeys[0] = keys[closestKeyIndex].codes[0];

        return closestKeyIndex;

    }

}