From a6024e8652493ab686e6c831abf0701329488334 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Tue, 16 Jun 2020 13:01:32 -0700
Subject: [PATCH] Fix accessibility regression.

Instead of setting mHideMenuAfterShown to true for all cases, only do it
when accessibility isn't enabled.

Bug: 158662766
Test: Double tap when PIP focused
Change-Id: I18713ab1fdf511b74108df355204b2c54913a078
---
 .../src/com/android/systemui/pip/phone/PipTouchHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
index 3cc9127068bf5..74f0d9741fbc7 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
@@ -688,11 +688,11 @@ public class PipTouchHandler {
                 break;
             }
             case MotionEvent.ACTION_HOVER_EXIT: {
-                mHideMenuAfterShown = true;
                 // 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()) {
+                    mHideMenuAfterShown = true;
                     mMenuController.hideMenu();
                 }
                 if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {