aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/PointerTracker.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-10-10 17:16:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-10 17:16:51 -0700
commitef38215fa412217f2f80ed7512eeede406bde2e0 (patch)
treeb52fd635cc8e0716502d87e26020aca84aa1bdba /java/src/com/android/inputmethod/latin/PointerTracker.java
parente56e2d85dfe95a6dc67fd1bb6ac5514bd2719f81 (diff)
parentc4b93e8d90c566cf8604c59b0c07aa5eba544c2c (diff)
downloadlatinime-ef38215fa412217f2f80ed7512eeede406bde2e0.tar.gz
latinime-ef38215fa412217f2f80ed7512eeede406bde2e0.tar.xz
latinime-ef38215fa412217f2f80ed7512eeede406bde2e0.zip
Merge "Fix merge that should have been manually merged"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/PointerTracker.java')
-rw-r--r--java/src/com/android/inputmethod/latin/PointerTracker.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/PointerTracker.java b/java/src/com/android/inputmethod/latin/PointerTracker.java
index a1cc8090e..3b886200e 100644
--- a/java/src/com/android/inputmethod/latin/PointerTracker.java
+++ b/java/src/com/android/inputmethod/latin/PointerTracker.java
@@ -22,7 +22,6 @@ import com.android.inputmethod.latin.LatinKeyboardBaseView.UIHandler;
import android.content.res.Resources;
import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.Keyboard.Key;
import android.util.Log;
import android.view.MotionEvent;
@@ -429,7 +428,7 @@ public class PointerTracker {
// long press should not be started.
if (isTemporaryUpperCase() && key.temporaryShiftLabel != null)
return;
- mHandler.startLongPressTimer(LONGPRESS_TIMEOUT, keyIndex, this);
+ mHandler.startLongPressTimer(mLongPressKeyTimeout, keyIndex, this);
}
private boolean isTemporaryUpperCase() {