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

Commit 388df603 authored by Ben Lin's avatar Ben Lin
Browse files

PIP: Disable hover show/hide menu if accessibility service is on. 

With accessibility services on (e.g. Talkback), some MotionEvents get
transformed into HoverEvents. Notably in the case of TalkBack, tapping
on PIP will generate a pair of Hover enter/exit event, which then causes
the menu to immediately show/hide, and the user is unable to do
anything.

We will disable the hover behavior for Accessibility services, and allow
TalkBack users and such to open the menu via other menus (just tapping
it twice so it shows menu similiar to a regular user flow).

Bug: 152588263
Test: Enable talkback, enter PIP, tap once and then again - menu shows
Change-Id: I28c8faa0032bc2c7b8fa1ef5a9efde94a590293e
parent b1cd7d54

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+14 −3
Original line number Original line Diff line number Diff line
@@ -413,8 +413,14 @@ public class PipTouchHandler { 
                break;

                break;

            }

            }

            case MotionEvent.ACTION_HOVER_ENTER:

            case MotionEvent.ACTION_HOVER_ENTER:

                // If Touch Exploration is enabled, some a11y services (e.g. Talkback) is probably

                // on and changing MotionEvents into HoverEvents.

                // Let's not enable menu show/hide for a11y services.

                if (!mAccessibilityManager.isTouchExplorationEnabled()) {

                    mMenuController.showMenu(MENU_STATE_FULL, mMotionHelper.getBounds(),

                    mMenuController.showMenu(MENU_STATE_FULL, mMotionHelper.getBounds(),

                        mMovementBounds, false /* allowMenuTimeout */, false /* willResizeMenu */);

                            mMovementBounds, false /* allowMenuTimeout */,

                            false /* willResizeMenu */);

                }

            case MotionEvent.ACTION_HOVER_MOVE: {

            case MotionEvent.ACTION_HOVER_MOVE: {

                if (!shouldDeliverToMenu && !mSendingHoverAccessibilityEvents) {

                if (!shouldDeliverToMenu && !mSendingHoverAccessibilityEvents) {

                    sendAccessibilityHoverEvent(AccessibilityEvent.TYPE_VIEW_HOVER_ENTER);

                    sendAccessibilityHoverEvent(AccessibilityEvent.TYPE_VIEW_HOVER_ENTER);
@@ -423,7 +429,12 @@ public class PipTouchHandler { 
                break;

                break;

            }

            }

            case MotionEvent.ACTION_HOVER_EXIT: {

            case MotionEvent.ACTION_HOVER_EXIT: {

                // If Touch Exploration is enabled, some a11y services (e.g. Talkback) is probably

                // on and changing MotionEvents into HoverEvents.

                // Let's not enable menu show/hide for a11y services.

                if (!mAccessibilityManager.isTouchExplorationEnabled()) {

                    mMenuController.hideMenu();

                    mMenuController.hideMenu();

                }

                if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {

                if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {

                    sendAccessibilityHoverEvent(AccessibilityEvent.TYPE_VIEW_HOVER_EXIT);

                    sendAccessibilityHoverEvent(AccessibilityEvent.TYPE_VIEW_HOVER_EXIT);

                    mSendingHoverAccessibilityEvents = false;

                    mSendingHoverAccessibilityEvents = false;