From 2aa8078df86029dab394d8dd616f4f6decb39035 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 15 Sep 2010 15:02:29 +0900
Subject: All keys should be processed before processing modifier key

Bug: 2987077
Change-Id: I971c44be121d8780ec27aa1649fd0925e249fbbc
---
 java/src/com/android/inputmethod/latin/PointerTracker.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'java/src/com/android/inputmethod/latin/PointerTracker.java')

diff --git a/java/src/com/android/inputmethod/latin/PointerTracker.java b/java/src/com/android/inputmethod/latin/PointerTracker.java
index 958e57618..a612c8eec 100644
--- a/java/src/com/android/inputmethod/latin/PointerTracker.java
+++ b/java/src/com/android/inputmethod/latin/PointerTracker.java
@@ -123,8 +123,8 @@ public class PointerTracker {
         return isValidKeyIndex(keyIndex) ? mKeys[keyIndex] : null;
     }
 
-    public boolean isModifier() {
-        Key key = getKey(mCurrentKey);
+    private boolean isModifierInternal(int keyIndex) {
+        Key key = getKey(keyIndex);
         if (key == null)
             return false;
         int primaryCode = key.codes[0];
@@ -132,6 +132,14 @@ public class PointerTracker {
                 || primaryCode == Keyboard.KEYCODE_MODE_CHANGE;
     }
 
+    public boolean isModifier() {
+        return isModifierInternal(mCurrentKey);
+    }
+
+    public boolean isOnModifierKey(int x, int y) {
+        return isModifierInternal(mKeyDetector.getKeyIndexAndNearbyCodes(x, y, null));
+    }
+
     public void updateKey(int keyIndex) {
         if (mKeyAlreadyProcessed)
             return;
-- 
cgit v1.2.3-83-g751a