1 files changed, 9 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 6b4e9469f..397ac7eec 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -22,6 +22,7 @@ import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.SubtypeSwitcher;
 
 import android.content.res.Resources;
+import android.os.SystemClock;
 import android.util.Log;
 import android.view.MotionEvent;
 
@@ -540,8 +541,11 @@ public class PointerTracker {
 
     public void onLongPressed(PointerTrackerQueue queue) {
         mKeyAlreadyProcessed = true;
-        if (queue != null)
+        if (queue != null) {
+            // TODO: Support chording + long-press input.
+            queue.releaseAllPointersExcept(this, SystemClock.uptimeMillis(), true);
             queue.remove(this);
+        }
     }
 
     public void onCancelEvent(int x, int y, long eventTime, PointerTrackerQueue queue) {
@@ -635,8 +639,7 @@ public class PointerTracker {
         Key key = getKey(keyIndex);
         if (key.mCode == Keyboard.CODE_SHIFT) {
             mHandler.startLongPressShiftTimer(mLongPressShiftKeyTimeout, keyIndex, this);
-        } else if (key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY
-                && mKeyboard.isManualTemporaryUpperCase()) {
+        } else if (key.hasUppercaseLetter() && mKeyboard.isManualTemporaryUpperCase()) {
             // We need not start long press timer on the key which has manual temporary upper case
             // code defined and the keyboard is in manual temporary upper case mode.
             return;
@@ -663,10 +666,9 @@ public class PointerTracker {
             mKeyDetector.getKeyIndexAndNearbyCodes(x, y, codes);
 
             // If keyboard is in manual temporary upper case state and key has manual temporary
-            // shift code, alternate character code should be sent.
-            if (mKeyboard.isManualTemporaryUpperCase()
-                    && key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY) {
-                code = key.mManualTemporaryUpperCaseCode;
+            // uppercase letter as key hint letter, alternate character code should be sent.
+            if (mKeyboard.isManualTemporaryUpperCase() && key.hasUppercaseLetter()) {
+                code = key.mHintLetter.charAt(0);
                 codes[0] = code;
             }