Merge "Fix merge that should have been manually merged"

main
Kenny Root 2010-10-10 17:16:51 -07:00 committed by Android (Google) Code Review
commit ef38215fa4
1 changed files with 1 additions and 2 deletions

View File

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