commit f0572fd73366b9e954d84bc10c135dfc09fa4b8b
author Ben Lin <linben@google.com> Thu Apr 22 22:27:25 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 22 22:27:25 2021 +0000
tree e7e80e08b8a79a87bf88915d7e5442e621478eb6
parent a80a2548ca3c583c86bf7d50eada94e50fc053df
parent aeb4ac64f44c6cda2d18d0a254bcf84d27e08ace

Merge "PiP: Don't invoke double-tap gesture (maximize) if menu is showing." into sc-dev

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java
index 2a1fe60..6d96312 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java
@@ -872,7 +872,8 @@
                     mMotionHelper.flingToSnapTarget(vel.x, vel.y,
                             this::flingEndAction /* endAction */);
                 }
-            } else if (mTouchState.isDoubleTap() && !mPipBoundsState.isStashed()) {
+            } else if (mTouchState.isDoubleTap() && !mPipBoundsState.isStashed()
+                    && mMenuState != MENU_STATE_FULL) {
                 // If using pinch to zoom, double-tap functions as resizing between max/min size
                 if (mPipResizeGestureHandler.isUsingPinchToZoom()) {
                     final boolean toExpand = mPipBoundsState.getBounds().width()