Merge "Remove unnecessary override of MainKeyboardView.dispatchTouchEvent"

java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java

@@ -203,19 +203,6 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp
         return getAccessibilityNodeProvider();
     }
 
-    /**
-     * Intercepts touch events before dispatch when touch exploration is turned on in ICS and
-     * higher.
-     *
-     * @param event The motion event being dispatched.
-     * @return {@code true} if the event is handled
-     */
-    public boolean dispatchTouchEvent(final MotionEvent event) {
-        // To avoid accidental key presses during touch exploration, always drop
-        // touch events generated by the user.
-        return false;
-    }
-
     /**
      * Receives hover events when touch exploration is turned on in SDK versions ICS and higher.
      *

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

@@ -725,14 +725,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
         return mKeyTimerHandler.isInDoubleTapShiftKeyTimeout();
     }
 
-    @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) {