From c4b93e8d90c566cf8604c59b0c07aa5eba544c2c Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Sun, 10 Oct 2010 17:15:21 -0700
Subject: [PATCH] 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
---
java/src/com/android/inputmethod/latin/PointerTracker.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/PointerTracker.java b/java/src/com/android/inputmethod/latin/PointerTracker.java
index a1cc8090ef..3b886200eb 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() {
--
GitLab