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

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