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

Commit 4c1c101a authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Accessibility hover events are fired if hover otside of modal window. 

1. Added a check whether the received hover event is in the bounds
   if the view before sending accessiiblity hover events. Hence, if
   a widnow gets a hover event and it gets to its topmost view the
   latter will not fire an accessibility event.

bug:5233588

Change-Id: I61e81fbf0ce59a7f57377262ce066bcf8db98f56
parent 2d012c12

core/java/android/view/View.java

+20 −14
Original line number Diff line number Diff line
@@ -6052,23 +6052,29 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit 
     * @see #onHoverChanged

     */

    public boolean onHoverEvent(MotionEvent event) {

        switch (event.getAction()) {

            case MotionEvent.ACTION_HOVER_ENTER:

                if (!hasHoveredChild() && !mSendingHoverAccessibilityEvents) {

        // The root view may receive hover (or touch) events that are outside the bounds of

        // the window.  This code ensures that we only send accessibility events for

        // hovers that are actually within the bounds of the root view.

        final int action = event.getAction();

        if (!mSendingHoverAccessibilityEvents) {

            if ((action == MotionEvent.ACTION_HOVER_ENTER

                    || action == MotionEvent.ACTION_HOVER_MOVE)

                    && !hasHoveredChild()

                    && pointInView(event.getX(), event.getY())) {

                mSendingHoverAccessibilityEvents = true;

                sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_HOVER_ENTER);

            }

                break;

            case MotionEvent.ACTION_HOVER_EXIT:

                if (mSendingHoverAccessibilityEvents) {

        } else {

            if (action == MotionEvent.ACTION_HOVER_EXIT

                    || (action == MotionEvent.ACTION_HOVER_MOVE

                            && !pointInView(event.getX(), event.getY()))) {

                mSendingHoverAccessibilityEvents = false;

                sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_HOVER_EXIT);

            }

                break;

        }















        if (isHoverable()) {













            switch (event.getAction()) {













            switch (action) {















                case MotionEvent.ACTION_HOVER_ENTER:















                    setHovered(true);















                    break;