Merge "When Accessibility is on, intercept touch events during dispatch." into jb-mr1-dev

2 files changed, 13 insertions, 8 deletions

diff --git a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java b/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
index 77940c086..01220a58a 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
@@ -105,15 +105,15 @@ public class AccessibleKeyboardViewProxy extends AccessibilityDelegateCompat {
     }
 
     /**
-     * Receives motion events when touch exploration is turned on in SDK
-     * versions ICS and higher.
+     * Intercepts touch events before dispatch when touch exploration is turned
+     * on in ICS and higher.
      *
-     * @param event The motion event.
+     * @param event The motion event being dispatched.
      * @return {@code true} if the event is handled
      */
-    public boolean onTouchEvent(MotionEvent event) {
+    public boolean dispatchTouchEvent(MotionEvent event) {
         // To avoid accidental key presses during touch exploration, always drop
-        // non-hover touch events.
+        // touch events generated by the user.
         return false;
     }
 
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index f6b66a79e..4ed0f58e1 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -661,13 +661,18 @@ public class MainKeyboardView extends KeyboardView implements PointerTracker.Key
     }
 
     @Override
+    public boolean dispatchTouchEvent(MotionEvent event) {
+        if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
+            return AccessibleKeyboardViewProxy.getInstance().dispatchTouchEvent(event);
+        }
+        return super.dispatchTouchEvent(event);
+    }
+
+    @Override
     public boolean onTouchEvent(final MotionEvent me) {
         if (getKeyboard() == null) {
             return false;
         }
-        if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
-            return AccessibleKeyboardViewProxy.getInstance().onTouchEvent(me);
-        }
         return mTouchScreenRegulator.onTouchEvent(me);
     }