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

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

Merge changes I02f057bb,Ia640ead2 into rvc-dev am: 13be2bc4 

Change-Id: Ibd358b949edc87b2a3e29d19a0745b880c0b0d94
parents 819473e8 13be2bc4

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -346,6 +346,7 @@ public class PipTaskOrganizer extends ITaskOrganizer.Stub { 
        final SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction();

        final SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction();

        mSurfaceTransactionHelper

        mSurfaceTransactionHelper

                .crop(tx, mLeash, destinationBounds)

                .crop(tx, mLeash, destinationBounds)

                .resetScale(tx, mLeash, destinationBounds)

                .round(tx, mLeash, mInPip);

                .round(tx, mLeash, mInPip);

        scheduleFinishResizePip(tx, destinationBounds, TRANSITION_DIRECTION_NONE, null);

        scheduleFinishResizePip(tx, destinationBounds, TRANSITION_DIRECTION_NONE, null);

    }

    }

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -208,7 +208,8 @@ public class PipResizeGestureHandler { 
                    final Rect currentPipBounds = mMotionHelper.getBounds();

                    final Rect currentPipBounds = mMotionHelper.getBounds();

                    mLastResizeBounds.set(TaskResizingAlgorithm.resizeDrag(ev.getX(), ev.getY(),

                    mLastResizeBounds.set(TaskResizingAlgorithm.resizeDrag(ev.getX(), ev.getY(),

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

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

                            mMinSize.y, mMaxSize, true, true));

                            mMinSize.y, mMaxSize, true,

                            mLastDownBounds.width() > mLastDownBounds.height()));

                    mPipBoundsHandler.transformBoundsToAspectRatio(mLastResizeBounds);

                    mPipBoundsHandler.transformBoundsToAspectRatio(mLastResizeBounds);

                    mPipTaskOrganizer.scheduleUserResizePip(mLastDownBounds, mLastResizeBounds,

                    mPipTaskOrganizer.scheduleUserResizePip(mLastDownBounds, mLastResizeBounds,

                            null);

                            null);