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

am d8835326: Merge "Haptick and audio feedback on key repeat" 

* commit 'd88353266acff210e384bea2cb4f9c27c4e42110':
  Haptick and audio feedback on key repeat
main
Tadashi G. Takaoka 2013-05-22 10:46:53 -07:00 committed by Android Git Automerger
parent 75b75d8b28 d88353266a
commit a1f4af5011
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View File

@ -240,7 +240,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
case MSG_REPEAT_KEY: case MSG_REPEAT_KEY:
final Key currentKey = tracker.getKey(); final Key currentKey = tracker.getKey();
if (currentKey != null && currentKey.mCode == msg.arg1) { if (currentKey != null && currentKey.mCode == msg.arg1) {
tracker.onRegisterKey(currentKey); tracker.onRepeatKey(currentKey);
AudioAndHapticFeedbackManager.getInstance().hapticAndAudioFeedback(
currentKey.mCode, keyboardView);
startKeyRepeatTimer(tracker, mKeyRepeatInterval); startKeyRepeatTimer(tracker, mKeyRepeatInterval);
} }
break; break;

10
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View File

@ -1266,15 +1266,13 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (!key.isRepeatable()) return; if (!key.isRepeatable()) return;
// Don't start key repeat when we are in sliding input mode. // Don't start key repeat when we are in sliding input mode.
if (mIsInSlidingKeyInput) return; if (mIsInSlidingKeyInput) return;
onRegisterKey(key); onRepeatKey(key);
mTimerProxy.startKeyRepeatTimer(this); mTimerProxy.startKeyRepeatTimer(this);
} }
public void onRegisterKey(final Key key) { public void onRepeatKey(final Key key) {
if (key != null) { detectAndSendKey(key, key.mX, key.mY, SystemClock.uptimeMillis());
detectAndSendKey(key, key.mX, key.mY, SystemClock.uptimeMillis()); mTimerProxy.startTypingStateTimer(key);
mTimerProxy.startTypingStateTimer(key);
}
} }
private boolean isMajorEnoughMoveToBeOnNewKey(final int x, final int y, final long eventTime, private boolean isMajorEnoughMoveToBeOnNewKey(final int x, final int y, final long eventTime,