am 9c6e7e23: am b0c5ddb9: Merge "Stop vibration while repeating delete key in emoji view"

* commit '9c6e7e233ee2a6379f6b784c23bfba58861aae3d':
  Stop vibration while repeating delete key in emoji view
main
Satoshi Kataoka 2013-10-03 12:17:28 -07:00 committed by Android Git Automerger
commit 33587f919e
1 changed files with 6 additions and 4 deletions

View File

@ -718,12 +718,14 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
@Override
public void run() {
int repeatCount = 1;
int timeCount = 0;
while (timeCount < MAX_REPEAT_COUNT_TIME && !mAborted) {
if (timeCount > mKeyRepeatStartTimeout) {
pressDelete();
pressDelete(repeatCount);
}
timeCount += mKeyRepeatInterval;
++repeatCount;
try {
Thread.sleep(mKeyRepeatInterval);
} catch (InterruptedException e) {
@ -736,9 +738,9 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
}
}
public void pressDelete() {
public void pressDelete(int repeatCount) {
mKeyboardActionListener.onPressKey(
Constants.CODE_DELETE, 0 /* repeatCount */, true /* isSinglePointer */);
Constants.CODE_DELETE, repeatCount, true /* isSinglePointer */);
mKeyboardActionListener.onCodeInput(
Constants.CODE_DELETE, NOT_A_COORDINATE, NOT_A_COORDINATE);
mKeyboardActionListener.onReleaseKey(
@ -754,7 +756,7 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
switch(event.getAction()) {
case MotionEvent.ACTION_DOWN:
v.setBackgroundColor(mDeleteKeyPressedBackgroundColor);
pressDelete();
pressDelete(0 /* repeatCount */);
startRepeat();
return true;
case MotionEvent.ACTION_UP: