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

Commit 767cb513 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Use local leash to animate PiP activity surface" into udc-dev am: f3475fcf 

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



Change-Id: Icfbeae7b96ce9b44c473073586c15bc5dfd11831
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e6ad244 f3475fcf

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

+35 −5
Original line number Original line Diff line number Diff line
@@ -470,6 +470,7 @@ public class PipTransition extends PipTransitionController { 
            @NonNull Transitions.TransitionFinishCallback finishCallback,

            @NonNull Transitions.TransitionFinishCallback finishCallback,

            @NonNull TaskInfo taskInfo, @Nullable TransitionInfo.Change pipTaskChange) {

            @NonNull TaskInfo taskInfo, @Nullable TransitionInfo.Change pipTaskChange) {

        TransitionInfo.Change pipChange = pipTaskChange;

        TransitionInfo.Change pipChange = pipTaskChange;

        SurfaceControl activitySc = null;

        if (mCurrentPipTaskToken == null) {

        if (mCurrentPipTaskToken == null) {

            ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

            ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: There is no existing PiP Task for TRANSIT_EXIT_PIP", TAG);

                    "%s: There is no existing PiP Task for TRANSIT_EXIT_PIP", TAG);
@@ -482,6 +483,7 @@ public class PipTransition extends PipTransitionController { 
                if (mCurrentPipTaskToken.equals(change.getLastParent())) {

                if (mCurrentPipTaskToken.equals(change.getLastParent())) {

                    // Find the activity that is exiting PiP.

                    // Find the activity that is exiting PiP.

                    pipChange = change;

                    pipChange = change;

                    activitySc = change.getLeash();

                    break;

                    break;

                }

                }

            }

            }
@@ -498,17 +500,36 @@ public class PipTransition extends PipTransitionController { 
        // case it may not be in the screen coordinate.

        // case it may not be in the screen coordinate.

        // Reparent the pip leash to the root with max layer so that we can animate it outside of

        // Reparent the pip leash to the root with max layer so that we can animate it outside of

        // parent crop, and make sure it is not covered by other windows.

        // parent crop, and make sure it is not covered by other windows.

        final SurfaceControl pipLeash = pipChange.getLeash();

        final TransitionInfo.Root root = TransitionUtil.getRootFor(pipChange, info);

        final int rootIdx = TransitionUtil.rootIndexFor(pipChange, info);

        final SurfaceControl pipLeash;

        startTransaction.reparent(pipLeash, info.getRoot(rootIdx).getLeash());

        if (activitySc != null) {

            // Use a local leash to animate activity in case the activity has letterbox which may

            // be broken by PiP animation, e.g. always end at 0,0 in parent and unable to include

            // letterbox area in crop bounds.

            final SurfaceControl activitySurface = pipChange.getLeash();

            pipLeash = new SurfaceControl.Builder()

                    .setName(activitySc + "_pip-leash")

                    .setContainerLayer()

                    .setHidden(false)

                    .setParent(root.getLeash())

                    .build();

            startTransaction.reparent(activitySurface, pipLeash);

            // Put the activity at local position with offset in case it is letterboxed.

            final Point activityOffset = pipChange.getEndRelOffset();

            startTransaction.setPosition(activitySc, activityOffset.x, activityOffset.y);

        } else {

            pipLeash = pipChange.getLeash();

            startTransaction.reparent(pipLeash, root.getLeash());

        }

        startTransaction.setLayer(pipLeash, Integer.MAX_VALUE);

        startTransaction.setLayer(pipLeash, Integer.MAX_VALUE);

        // Note: because of this, the bounds to animate should be translated to the root coordinate.

        // Note: because of this, the bounds to animate should be translated to the root coordinate.

        final Point offset = info.getRoot(rootIdx).getOffset();

        final Point offset = root.getOffset();

        final Rect currentBounds = mPipBoundsState.getBounds();

        final Rect currentBounds = mPipBoundsState.getBounds();

        currentBounds.offset(-offset.x, -offset.y);

        currentBounds.offset(-offset.x, -offset.y);

        startTransaction.setPosition(pipLeash, currentBounds.left, currentBounds.top);

        startTransaction.setPosition(pipLeash, currentBounds.left, currentBounds.top);





        final WindowContainerToken pipTaskToken = pipChange.getContainer();

        final WindowContainerToken pipTaskToken = pipChange.getContainer();

        final boolean useLocalLeash = activitySc != null;

        final boolean toFullscreen = pipChange.getEndAbsBounds().equals(

        final boolean toFullscreen = pipChange.getEndAbsBounds().equals(

                mPipBoundsState.getDisplayBounds());

                mPipBoundsState.getDisplayBounds());

        mFinishCallback = (wct, wctCB) -> {

        mFinishCallback = (wct, wctCB) -> {
@@ -518,6 +539,14 @@ public class PipTransition extends PipTransitionController { 
                wct.setBounds(pipTaskToken, null);

                wct.setBounds(pipTaskToken, null);

                mPipOrganizer.applyWindowingModeChangeOnExit(wct, TRANSITION_DIRECTION_LEAVE_PIP);

                mPipOrganizer.applyWindowingModeChangeOnExit(wct, TRANSITION_DIRECTION_LEAVE_PIP);

            }

            }

            if (useLocalLeash) {

                if (mPipAnimationController.isAnimating()) {

                    mPipAnimationController.getCurrentAnimator().end();

                }

                // Make sure the animator don't use the released leash, e.g. mergeAnimation.

                mPipAnimationController.resetAnimatorState();

                finishTransaction.remove(pipLeash);

            }

            finishCallback.onTransitionFinished(wct, wctCB);

            finishCallback.onTransitionFinished(wct, wctCB);

        };

        };

        mFinishTransaction = finishTransaction;

        mFinishTransaction = finishTransaction;
@@ -545,7 +574,8 @@ public class PipTransition extends PipTransitionController { 
        // Set the initial frame as scaling the end to the start.

        // Set the initial frame as scaling the end to the start.

        final Rect destinationBounds = new Rect(pipChange.getEndAbsBounds());

        final Rect destinationBounds = new Rect(pipChange.getEndAbsBounds());

        destinationBounds.offset(-offset.x, -offset.y);

        destinationBounds.offset(-offset.x, -offset.y);

        startTransaction.setWindowCrop(pipLeash, destinationBounds);

        startTransaction.setWindowCrop(pipLeash, destinationBounds.width(),

                destinationBounds.height());

        mSurfaceTransactionHelper.scale(startTransaction, pipLeash, destinationBounds,

        mSurfaceTransactionHelper.scale(startTransaction, pipLeash, destinationBounds,

                currentBounds);

                currentBounds);

        startTransaction.apply();

        startTransaction.apply();