Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0572fd7 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

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

parents a80a2548 aeb4ac64

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

+2 −1
Original line number Diff line number Diff line
@@ -872,7 +872,8 @@ public class PipTouchHandler { 
                    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()