diff options
| author |   Kenny Root <kroot@google.com> | 2010-10-10 17:15:21 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-10 17:15:21 -0700 |
| commit | c4b93e8d90c566cf8604c59b0c07aa5eba544c2c (patch) | |
| tree | 80a1a10f1b3183666b208cae0c490c2f345f1acd /java/src/com/android/inputmethod/latin/PointerTracker.java | |
| parent | f156f30614aa5b3336f39d02da3e4ed0c46de9ed (diff) | |
| download | latinime-c4b93e8d90c566cf8604c59b0c07aa5eba544c2c.tar.gz latinime-c4b93e8d90c566cf8604c59b0c07aa5eba544c2c.tar.xz latinime-c4b93e8d90c566cf8604c59b0c07aa5eba544c2c.zip | |
Fix merge that should have been manually merged
master was still using the deleted constants in different places and
Java 6 didn't like the imports.
Change-Id: If9472a2acb029e56790dc4d19ab62e608c970175
Diffstat (limited to 'java/src/com/android/inputmethod/latin/PointerTracker.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/PointerTracker.java | 3 |
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() { |