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

Merge "Add hysteresis movement key debouncing"

main
Tadashi G. Takaoka 2010-07-28 11:31:59 -07:00 committed by Android (Google) Code Review
parent 80aa14fd43 e36bce042b
commit 7a73c18fd7
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values/dimens.xml
View File

@ -27,4 +27,5 @@
will not go into extract (fullscreen) mode. -->
<dimen name="max_height_for_fullscreen">2.5in</dimen>
<dimen name="key_text_size">22sp</dimen>
<dimen name="key_debounce_hysteresis_distance">0.05in</dimen>
</resources>

40
java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
View File

@ -332,12 +332,10 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
private long mLastMoveTime;
private long mCurrentKeyTime;
private int mKeyDebounceThreshold;
private static final int KEY_DEBOUNCE_FACTOR = 6;
private final int mKeyDebounceThresholdSquared;
KeyDebouncer(int proximityThreshold) {
// 1/KEY_DEBOUNCE_FACTOR of distance between adjacent keys
mKeyDebounceThreshold = proximityThreshold / KEY_DEBOUNCE_FACTOR;
KeyDebouncer(float hysteresisPixel) {
mKeyDebounceThresholdSquared = (int)(hysteresisPixel * hysteresisPixel);
}
public int getLastCodeX() {
@ -375,15 +373,23 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
mLastCodeY = mLastY;
}
public boolean isMinorMoveBounce(int x, int y, int keyIndex, int currentKey) {
// TODO: Check the coordinate against each key border. The current
// logic is pretty simple.
if (keyIndex == currentKey)
public boolean isMinorMoveBounce(int x, int y, Key newKey, Key curKey) {
if (newKey == curKey)
return true;
int dx = x - mLastCodeX;
int dy = y - mLastCodeY;
int delta = dx * dx + dy * dy;
return delta < mKeyDebounceThreshold;
return getSquareDistanceToKeyEdge(x, y, curKey) < mKeyDebounceThresholdSquared;
}
private static int getSquareDistanceToKeyEdge(int x, int y, Key key) {
final int left = key.x;
final int right = key.x + key.width;
final int top = key.y;
final int bottom = key.y + key.height;
final int edgeX = x < left ? left : (x > right ? right : x);
final int edgeY = y < top ? top : (y > bottom ? bottom : y);
final int dx = x - edgeX;
final int dy = y - edgeY;
return dx * dx + dy * dy;
}
public void startTimeDebouncing(long eventTime) {
@ -766,7 +772,9 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
mProximityThreshold = (int) (dimensionSum * 1.4f / length);
mProximityThreshold *= mProximityThreshold; // Square it
mDebouncer = new KeyDebouncer(mProximityThreshold);
final float hysteresisPixel = getContext().getResources()
.getDimension(R.dimen.key_debounce_hysteresis_distance);
mDebouncer = new KeyDebouncer(hysteresisPixel);
}
@Override
@ -1354,8 +1362,8 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
if (mCurrentKey == NOT_A_KEY) {
mCurrentKey = keyIndex;
mDebouncer.updateTimeDebouncing(eventTime);
} else if (mDebouncer.isMinorMoveBounce(touchX, touchY,
keyIndex, mCurrentKey)) {
} else if (mDebouncer.isMinorMoveBounce(touchX, touchY, mKeys[keyIndex],
mKeys[mCurrentKey])) {
mDebouncer.updateTimeDebouncing(eventTime);
continueLongPress = true;
} else if (mRepeatKeyIndex == NOT_A_KEY) {