PiP: Don't invoke double-tap gesture (maximize) if menu is showing.
If the menu is showing and populated with icons, the user intention is
more likely to interact with the menu. Prioritize on that and drop
gestures such as double-tap.
Bug: 185458696
Bug: 184789345
Test: Double-tap while menu is showing
Change-Id: Icac92ec8cafdcb2f3a11919a4c6a227bf85d446c
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 f29d4f5..a669d98 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
@@ -871,7 +871,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()