From c2468e1b0703facb1f68089598a4525ae78642d6 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Thu, 2 Jul 2020 02:57:24 +0000
Subject: [PATCH] Revert "PiP: Potentially hide menu immediately after it
 appears."

This reverts commit 9be3e7878d67c6f006e536a5d79caabf4fbfe0b1.

Reason for revert: Causes weird synchronization issues
Bug: 160354150

Change-Id: I902aa22c71a77d783c80c76464861b929f5fdf1c
---
 .../src/com/android/systemui/pip/phone/PipTouchHandler.java | 6 ------
 1 file changed, 6 deletions(-)

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 d7cc11b7fd150..a8130a1e6d1a2 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
@@ -171,7 +171,6 @@ public class PipTouchHandler {
     private float mSavedSnapFraction = -1f;
     private boolean mSendingHoverAccessibilityEvents;
     private boolean mMovementWithinDismiss;
-    private boolean mHideMenuAfterShown = false;
     private PipAccessibilityInteractionConnection mConnection;
 
     // Touch state
@@ -726,7 +725,6 @@ public class PipTouchHandler {
                 // on and changing MotionEvents into HoverEvents.
                 // Let's not enable menu show/hide for a11y services.
                 if (!mAccessibilityManager.isTouchExplorationEnabled()) {
-                    mHideMenuAfterShown = true;
                     mTouchState.scheduleHoverExitTimeoutCallback();
                 }
                 if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {
@@ -813,9 +811,6 @@ public class PipTouchHandler {
                 mSavedSnapFraction = mMotionHelper.animateToExpandedState(expandedBounds,
                         mMovementBounds, mExpandedMovementBounds, callback);
             }
-            if (mHideMenuAfterShown) {
-                mMenuController.hideMenu();
-            }
         } else if (menuState == MENU_STATE_NONE && mMenuState == MENU_STATE_FULL) {
             // Try and restore the PiP to the closest edge, using the saved snap fraction
             // if possible
@@ -853,7 +848,6 @@ public class PipTouchHandler {
             }
         }
         mMenuState = menuState;
-        mHideMenuAfterShown = false;
         updateMovementBounds();
         // If pip menu has dismissed, we should register the A11y ActionReplacingConnection for pip
         // as well, or it can't handle a11y focus and pip menu can't perform any action.