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

Commit 55821985 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "PiP: Hide menu when resize starts." into rvc-qpr-dev am: 3ed72f5a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12495828

Change-Id: I5af198aea1793036b4d5cf47244a8d752ef64324
parents 3221c2a1 3ed72f5a

packages/SystemUI/src/com/android/systemui/pip/phone/PipResizeGestureHandler.java

+9 −3
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class PipResizeGestureHandler { 
    private final Context mContext;

    private final PipBoundsHandler mPipBoundsHandler;

    private final PipMotionHelper mMotionHelper;

    private final PipMenuActivityController mMenuController;

    private final int mDisplayId;

    private final Executor mMainExecutor;

    private final SysUiState mSysUiState;
@@ -117,13 +118,14 @@ public class PipResizeGestureHandler { 


    public PipResizeGestureHandler(Context context, PipBoundsHandler pipBoundsHandler,

            PipMotionHelper motionHelper, DeviceConfigProxy deviceConfig,

            PipTaskOrganizer pipTaskOrganizer, Function<Rect, Rect> movementBoundsSupplier,

            Runnable updateMovementBoundsRunnable, SysUiState sysUiState,

            PipUiEventLogger pipUiEventLogger) {

            PipTaskOrganizer pipTaskOrganizer, PipMenuActivityController pipMenuController,

            Function<Rect, Rect> movementBoundsSupplier, Runnable updateMovementBoundsRunnable,

            SysUiState sysUiState, PipUiEventLogger pipUiEventLogger) {

        mContext = context;

        mDisplayId = context.getDisplayId();

        mMainExecutor = context.getMainExecutor();

        mPipBoundsHandler = pipBoundsHandler;

        mMenuController = pipMenuController;

        mMotionHelper = motionHelper;

        mPipTaskOrganizer = pipTaskOrganizer;

        mMovementBoundsSupplier = movementBoundsSupplier;
@@ -322,6 +324,10 @@ public class PipResizeGestureHandler { 
                        mInputMonitor.pilferPointers();

                    }

                    if (mThresholdCrossed) {

                        if (mMenuController.isMenuActivityVisible()) {

                            mMenuController.hideMenuWithoutResize();

                            mMenuController.hideMenu();

                        }

                        final Rect currentPipBounds = mMotionHelper.getBounds();

                        mLastResizeBounds.set(TaskResizingAlgorithm.resizeDrag(x, y,

                                mDownPoint.x, mDownPoint.y, currentPipBounds, mCtrlType, mMinSize.x,

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public class PipTouchHandler { 
                mSnapAlgorithm, floatingContentCoordinator);

        mPipResizeGestureHandler =

                new PipResizeGestureHandler(context, pipBoundsHandler, mMotionHelper,

                        deviceConfig, pipTaskOrganizer, this::getMovementBounds,

                        deviceConfig, pipTaskOrganizer, menuController, this::getMovementBounds,

                        this::updateMovementBounds, sysUiState, pipUiEventLogger);

        mTouchState = new PipTouchState(ViewConfiguration.get(context), mHandler,

                () -> mMenuController.showMenuWithDelay(MENU_STATE_FULL, mMotionHelper.getBounds(),