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

Commit 7b534cc8 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Preserve the bounds upon double-tap PiP 

Add the missing call to indicated user resized PiP upon double-tap.

Flag: EXEMPT bugfix
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/hEnoCnNHGD7i6vRKCYgzVj
Bug: 394001686
Test: Double-tap PiP window while IME is present, then dismiss IME
Change-Id: Ic23ddeac874806669305afda930d63a0b4be5ee7
parent 91d57642

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

+1 −4
Original line number Diff line number Diff line
@@ -909,10 +909,6 @@ public class PipTouchHandler { 
                    && 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()

                            < mPipBoundsState.getMaxSize().x

                            && mPipBoundsState.getBounds().height()

                            < mPipBoundsState.getMaxSize().y;

                    if (mMenuController.isMenuVisible()) {

                        mMenuController.hideMenu(ANIM_TYPE_NONE, false /* resize */);

                    }
@@ -931,6 +927,7 @@ public class PipTouchHandler { 
                    } else {

                        animateToUnexpandedState(getUserResizeBounds());

                    }

                    mPipBoundsState.setHasUserResizedPip(true);

                } else {

                    // Expand to fullscreen if this is a double tap

                    // the PiP should be frozen until the transition ends

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

+1 −0
Original line number Diff line number Diff line
@@ -987,6 +987,7 @@ public class PipTouchHandler implements PipTransitionState.PipTransitionStateCha 
                    } else {

                        animateToUnexpandedState(getUserResizeBounds());

                    }

                    mPipBoundsState.setHasUserResizedPip(true);

                } else {

                    // Expand to fullscreen if this is a double tap

                    // the PiP should be frozen until the transition ends