1 files changed, 5 insertions, 16 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 198e06aab..fb4021048 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -18,6 +18,7 @@ package com.android.inputmethod.keyboard;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.SystemClock;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.widget.TextView;
@@ -342,7 +343,7 @@ public class PointerTracker {
     private void setPressedKeyGraphics(int keyIndex) {
         final Key key = getKey(keyIndex);
         if (key != null && key.isEnabled()) {
-            if (isKeyPreviewRequired(key)) {
+            if (!key.noKeyPreview()) {
                 mDrawingProxy.showKeyPreview(keyIndex, this);
             }
             key.onPressed();
@@ -350,18 +351,6 @@ public class PointerTracker {
         }
     }
 
-    // The modifier key, such as shift key, should not show its key preview.
-    private static boolean isKeyPreviewRequired(Key key) {
-        final int code = key.mCode;
-        // TODO: Stop hard-coding these key codes here, and add a new key attribute of a key.
-        if (code == Keyboard.CODE_SPACE || code == Keyboard.CODE_ENTER
-                || code == Keyboard.CODE_DELETE || isModifierCode(code)
-                || code == Keyboard.CODE_SETTINGS || code == Keyboard.CODE_SHORTCUT) {
-            return false;
-        }
-        return true;
-    }
-
     public int getLastX() {
         return mLastX;
     }
@@ -618,9 +607,9 @@ public class PointerTracker {
         }
     }
 
-    public void onShowMoreKeysPanel(int x, int y, long eventTime, KeyEventHandler handler) {
+    public void onShowMoreKeysPanel(int x, int y, KeyEventHandler handler) {
         onLongPressed();
-        onDownEvent(x, y, eventTime, handler);
+        onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
         mIsShowingMoreKeysPanel = true;
     }
 
@@ -658,7 +647,7 @@ public class PointerTracker {
 
     private void startRepeatKey(int keyIndex) {
         final Key key = getKey(keyIndex);
-        if (key != null && key.mRepeatable) {
+        if (key != null && key.isRepeatable()) {
             onRepeatKey(keyIndex);
             mTimerProxy.startKeyRepeatTimer(sDelayBeforeKeyRepeatStart, keyIndex, this);
             mIsRepeatableKey = true;