Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Lin
2021-04-22 22:27:25 +00:00
committed by Android (Google) Code Review
parent a80a2548ca aeb4ac64f4
commit f0572fd733
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()