commit ef38215fa412217f2f80ed7512eeede406bde2e0
author Kenny Root <kroot@google.com> Sun Oct 10 17:16:51 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Oct 10 17:16:51 2010 -0700
tree b52fd635cc8e0716502d87e26020aca84aa1bdba
parent e56e2d85dfe95a6dc67fd1bb6ac5514bd2719f81
parent c4b93e8d90c566cf8604c59b0c07aa5eba544c2c

Merge "Fix merge that should have been manually merged"

java/src/com/android/inputmethod/latin/PointerTracker.java

diff --git a/java/src/com/android/inputmethod/latin/PointerTracker.java b/java/src/com/android/inputmethod/latin/PointerTracker.java
index a1cc809..3b88620 100644
--- a/java/src/com/android/inputmethod/latin/PointerTracker.java
+++ b/java/src/com/android/inputmethod/latin/PointerTracker.java
@@ -22,7 +22,6 @@
 
 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 @@
         // 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() {