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

Commit 9341dd5d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Ensures display rotation triggers PiP re-position" into rvc-dev am: abe2fed8 

Change-Id: Ibd9c220dc2e8aeaa3c37d898e7a16c5042659cb4
parents e831608d abe2fed8

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

+4 −1
Original line number Diff line number Diff line
@@ -341,7 +341,10 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 


    private void updateMovementBounds(Rect animatingBounds, boolean fromImeAdjustment,

            boolean fromShelfAdjustment) {

        // Populate inset / normal bounds and DisplayInfo from mPipBoundsHandler first.

        mPipTaskOrganizer.onDisplayInfoChanged(mTmpDisplayInfo);

        // Populate inset / normal bounds and DisplayInfo from mPipBoundsHandler before

        // passing to mTouchHandler, mTouchHandler would rely on the bounds calculated by

        // mPipBoundsHandler with up-to-dated information

        mPipBoundsHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds,

                animatingBounds, mTmpDisplayInfo);

        mTouchHandler.onMovementBoundsChanged(mTmpInsetBounds, mTmpNormalBounds,

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

+1 −3
Original line number Diff line number Diff line
@@ -411,11 +411,9 @@ public class PipMotionHelper implements Handler.Callback, PipAppOpsListener.Call 
    }



    private void adjustAndAnimatePipOffset(Rect originalBounds, int offset, int duration) {

        if (offset == 0) {

            return;

        }

        SomeArgs args = SomeArgs.obtain();

        args.arg1 = originalBounds;

        // offset would be zero if triggered from screen rotation.

        args.argi1 = offset;

        args.argi2 = duration;

        mHandler.sendMessage(mHandler.obtainMessage(MSG_OFFSET_ANIMATE, args));

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

+5 −1
Original line number Diff line number Diff line
@@ -269,6 +269,10 @@ public class PipTouchHandler { 
    public void onMovementBoundsChanged(Rect insetBounds, Rect normalBounds, Rect curBounds,

            boolean fromImeAdjustment, boolean fromShelfAdjustment, int displayRotation) {

        final int bottomOffset = mIsImeShowing ? mImeHeight : 0;

        final boolean fromDisplayRotationChanged = (mDisplayRotation != displayRotation);

        if (fromDisplayRotationChanged) {

            mTouchState.reset();

        }



        // Re-calculate the expanded bounds

        mNormalBounds = normalBounds;
@@ -296,7 +300,7 @@ public class PipTouchHandler { 


        // If this is from an IME or shelf adjustment, then we should move the PiP so that it is not

        // occluded by the IME or shelf.

        if (fromImeAdjustment || fromShelfAdjustment) {

        if (fromImeAdjustment || fromShelfAdjustment || fromDisplayRotationChanged) {

            if (mTouchState.isUserInteracting()) {

                // Defer the update of the current movement bounds until after the user finishes

                // touching the screen