Merge "Make the primary character stable"

This commit is contained in:
satok 2012-03-18 22:01:50 -07:00 committed by Android (Google) Code Review
commit f9c2773b09

View file

@ -265,9 +265,9 @@ public class KeyDetector {
for (final Key key: mKeyboard.getNearestKeys(touchX, touchY)) {
final boolean isOnKey = key.isOnKey(touchX, touchY);
final int distance = key.squaredDistanceToEdge(touchX, touchY);
// TODO: need to take care of hitbox overlaps
// To take care of hitbox overlaps, we compare mCode here too.
if (primaryKey == null || distance < minDistance
|| (distance == minDistance && isOnKey)) {
|| (distance == minDistance && isOnKey && key.mCode > primaryKey.mCode)) {
minDistance = distance;
primaryKey = key;
}