Fix to enable having a primary index that's not the closest match.

Needed for predictive hit target correction in LatinIME.

1 files changed, 4 insertions, 4 deletions

diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java
index cecacaa..28a86b8 100755
--- a/core/java/android/inputmethodservice/KeyboardView.java
+++ b/core/java/android/inputmethodservice/KeyboardView.java
@@ -742,6 +742,10 @@ public class KeyboardView extends View implements View.OnClickListener {
             final Key key = keys[nearestKeyIndices[i]];
             int dist = 0;
             boolean isInside = key.isInside(x,y);
+            if (isInside) {
+                primaryIndex = nearestKeyIndices[i];
+            }
+
             if (((mProximityCorrectOn 
                     && (dist = key.squaredDistanceFrom(x, y)) < mProximityThreshold) 
                     || isInside)
@@ -770,10 +774,6 @@ public class KeyboardView extends View implements View.OnClickListener {
                     }
                 }
             }
-            
-            if (isInside) {
-                primaryIndex = nearestKeyIndices[i];
-            }
         }
         if (primaryIndex == NOT_A_KEY) {
             primaryIndex = closestKey;