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
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() {