aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-03 15:37:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-03 15:37:48 -0700
commit9442c3f3909f25b8474d14e1d8ace5ac51a291ae (patch)
tree5849abb53b82d3a1bfed946a19c1f37d48233f9a /java/src
parent2cc6956ce0684bcee94ad73c4ade6fd7e682ad53 (diff)
parent33587f919ef19d89296491a3d0e746b610838828 (diff)
downloadlatinime-9442c3f3909f25b8474d14e1d8ace5ac51a291ae.tar.gz
latinime-9442c3f3909f25b8474d14e1d8ace5ac51a291ae.tar.xz
latinime-9442c3f3909f25b8474d14e1d8ace5ac51a291ae.zip
am 33587f91: am 9c6e7e23: am b0c5ddb9: Merge "Stop vibration while repeating delete key in emoji view"
* commit '33587f919ef19d89296491a3d0e746b610838828': Stop vibration while repeating delete key in emoji view
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
index 61dc56ed1..eb48d01f6 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -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: