2 files changed, 37 insertions, 5 deletions

diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
index 812bbc881..955cb4c42 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java
@@ -90,6 +90,7 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat
         final AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
         event.setPackageName(mKeyboardView.getContext().getPackageName());
         event.setClassName(key.getClass().getName());
+        event.setContentDescription(keyDescription);
         event.setEnabled(true);
 
         final AccessibilityRecordCompat record = new AccessibilityRecordCompat(event);
@@ -158,12 +159,12 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat
             info = AccessibilityNodeInfoCompat.obtain();
             info.setPackageName(mKeyboardView.getContext().getPackageName());
             info.setClassName(key.getClass().getName());
+            info.setContentDescription(keyDescription);
             info.setBoundsInParent(boundsInParent);
             info.setBoundsInScreen(boundsInScreen);
             info.setParent(mKeyboardView);
             info.setSource(mKeyboardView, virtualViewId);
             info.setBoundsInScreen(boundsInScreen);
-            info.setText(keyDescription);
             info.setEnabled(true);
         }
 
@@ -211,14 +212,17 @@ public class AccessibilityEntityProvider extends AccessibilityNodeProviderCompat
     }
 
     /**
-     * Generates a virtual view identifier for the specified key.
+     * Generates a virtual view identifier for the given key. Returned
+     * identifiers are valid until the next global layout state change.
      *
      * @param key The key to identify.
      * @return A virtual view identifier.
      */
     private static int generateVirtualViewIdForKey(Key key) {
-        // The key code is unique within an instance of a Keyboard.
-        return key.mCode;
+        // The key x- and y-coordinates are stable between layout changes.
+        // Generate an identifier by bit-shifting the x-coordinate to the
+        // left-half of the integer and OR'ing with the y-coordinate.
+        return ((0xFFFF & key.mX) << (Integer.SIZE / 2)) | (0xFFFF & key.mY);
     }
 
     private final OnGlobalLayoutListener mGlobalLayoutListener = new OnGlobalLayoutListener() {
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java b/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
index ba814e390..34817ba4e 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
@@ -23,6 +23,7 @@ import android.support.v4.view.ViewCompat;
 import android.support.v4.view.accessibility.AccessibilityEventCompat;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 import android.view.accessibility.AccessibilityEvent;
 
 import com.android.inputmethod.keyboard.Key;
@@ -41,6 +42,12 @@ public class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
 
     private Key mLastHoverKey = null;
 
+    /**
+     * Inset in pixels to look for keys when the user's finger exits the
+     * keyboard area. See {@link ViewConfiguration#getScaledEdgeSlop()}.
+     */
+    private int mEdgeSlop;
+
     public static void init(InputMethodService inputMethod) {
         sInstance.initInternal(inputMethod);
     }
@@ -55,6 +62,7 @@ public class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
 
     private void initInternal(InputMethodService inputMethod) {
         mInputMethod = inputMethod;
+        mEdgeSlop = ViewConfiguration.get(inputMethod).getScaledEdgeSlop();
     }
 
     /**
@@ -108,8 +116,14 @@ public class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
         mLastHoverKey = key;
 
         switch (event.getAction()) {
-        case MotionEvent.ACTION_HOVER_ENTER:
         case MotionEvent.ACTION_HOVER_EXIT:
+            // Make sure we're not getting an EXIT event because the user slid
+            // off the keyboard area, then force a key press.
+            if (pointInView(x, y)) {
+                tracker.onRegisterKey(key);
+            }
+            //$FALL-THROUGH$
+        case MotionEvent.ACTION_HOVER_ENTER:
             return onHoverKey(key, event);
         case MotionEvent.ACTION_HOVER_MOVE:
             if (key != previousKey) {
@@ -123,6 +137,20 @@ public class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
     }
 
     /**
+     * Utility method to determine whether the given point, in local
+     * coordinates, is inside the view, where the area of the view is contracted
+     * by the edge slop factor.
+     *
+     * @param localX The local x-coordinate.
+     * @param localY The local y-coordinate.
+     */
+    private boolean pointInView(int localX, int localY) {
+        return (localX >= mEdgeSlop) && (localY >= mEdgeSlop)
+                && (localX < (mView.getWidth() - mEdgeSlop))
+                && (localY < (mView.getHeight() - mEdgeSlop));
+    }
+
+    /**
      * Simulates a transition between two {@link Key}s by sending a HOVER_EXIT
      * on the previous key, a HOVER_ENTER on the current key, and a HOVER_MOVE
      * on the current key.