Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1751615f authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary override of MainKeyboardView.dispatchTouchEvent"

parents 3dd6bdf9 800ab579
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -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.
     *
+0 −8
Original line number Diff line number Diff line
@@ -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) {