Merge "Fix accessibility regression." into rvc-dev am: e2714d739a am: d743fbf0b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881633

Change-Id: Idbe2a6bbec9c21f21ac1e241a4c73aa4a1d2a609
This commit is contained in:
Ben Lin
2020-06-18 14:41:28 +00:00
committed by Automerger Merge Worker

View File

@@ -688,11 +688,11 @@ public class PipTouchHandler {
break; break;
} }
case MotionEvent.ACTION_HOVER_EXIT: { case MotionEvent.ACTION_HOVER_EXIT: {
mHideMenuAfterShown = true;
// If Touch Exploration is enabled, some a11y services (e.g. Talkback) is probably // If Touch Exploration is enabled, some a11y services (e.g. Talkback) is probably
// on and changing MotionEvents into HoverEvents. // on and changing MotionEvents into HoverEvents.
// Let's not enable menu show/hide for a11y services. // Let's not enable menu show/hide for a11y services.
if (!mAccessibilityManager.isTouchExplorationEnabled()) { if (!mAccessibilityManager.isTouchExplorationEnabled()) {
mHideMenuAfterShown = true;
mMenuController.hideMenu(); mMenuController.hideMenu();
} }
if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) { if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {