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

Commit 7d272aa7 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Add a DefaultMixedHandler handler combined transitions" into tm-qpr-dev am: f7369c8b 

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



Change-Id: Ied412a43b6513cdb4138eec7257828824ba878d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c435e6ca f7369c8b

libs/WindowManager/Shell/src/com/android/wm/shell/ShellInitImpl.java

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.wm.shell.pip.phone.PipTouchHandler; 
import com.android.wm.shell.recents.RecentTasksController;

import com.android.wm.shell.splitscreen.SplitScreenController;

import com.android.wm.shell.startingsurface.StartingWindowController;

import com.android.wm.shell.transition.DefaultMixedHandler;

import com.android.wm.shell.transition.Transitions;

import com.android.wm.shell.unfold.UnfoldTransitionHandler;
@@ -131,6 +132,13 @@ public class ShellInitImpl { 
        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            mTransitions.register(mShellTaskOrganizer);

            mUnfoldTransitionHandler.ifPresent(UnfoldTransitionHandler::init);

            if (mSplitScreenOptional.isPresent() && mPipTouchHandlerOptional.isPresent()) {

                final DefaultMixedHandler mixedHandler = new DefaultMixedHandler(mTransitions,

                        mPipTouchHandlerOptional.get().getTransitionHandler(),

                        mSplitScreenOptional.get().getTransitionHandler());

                // Added at end so that it has highest priority.

                mTransitions.addHandler(mixedHandler);

            }

        }



        // TODO(b/181599115): This should really be the pip controller, but until we can provide the

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

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        displayController.addDisplayWindowListener(this);

    }



    public PipTransitionController getTransitionController() {

        return mPipTransitionController;

    }



    public Rect getCurrentOrAnimatingBounds() {

        PipAnimationController.PipTransitionAnimator animator =

                mPipAnimationController.getCurrentAnimator();

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

+81 −68
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static android.view.WindowManager.TRANSIT_OPEN; 
import static android.view.WindowManager.TRANSIT_PIP;

import static android.view.WindowManager.transitTypeToString;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;



import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA;

import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_BOUNDS;
@@ -52,6 +51,7 @@ import android.graphics.Rect; 
import android.os.IBinder;

import android.view.Surface;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.window.TransitionInfo;

import android.window.TransitionRequestInfo;

import android.window.WindowContainerToken;
@@ -217,8 +217,9 @@ public class PipTransition extends PipTransitionController { 
        }



        // Entering PIP.

        if (isEnteringPip(info, mCurrentPipTaskToken)) {

            return startEnterAnimation(info, startTransaction, finishTransaction, finishCallback);

        if (isEnteringPip(info)) {

            startEnterAnimation(info, startTransaction, finishTransaction, finishCallback);

            return true;

        }



        // For transition that we don't animate, but contains the PIP leash, we need to update the
@@ -245,19 +246,28 @@ public class PipTransition extends PipTransitionController { 
    @Override

    public WindowContainerTransaction handleRequest(@NonNull IBinder transition,

            @NonNull TransitionRequestInfo request) {

        if (request.getType() == TRANSIT_PIP) {

        if (requestHasPipEnter(request)) {

            WindowContainerTransaction wct = new WindowContainerTransaction();

            augmentRequest(transition, request, wct);

            return wct;

        } else {

            return null;

        }

    }



    @Override

    public void augmentRequest(@NonNull IBinder transition,

            @NonNull TransitionRequestInfo request, @NonNull WindowContainerTransaction outWCT) {

        if (!requestHasPipEnter(request)) {

            throw new IllegalStateException("Called PiP augmentRequest when request has no PiP");

        }

        if (mOneShotAnimationType == ANIM_TYPE_ALPHA) {

            mRequestedEnterTransition = transition;

            mRequestedEnterTask = request.getTriggerTask().token;

                wct.setActivityWindowingMode(request.getTriggerTask().token,

            outWCT.setActivityWindowingMode(request.getTriggerTask().token,

                    WINDOWING_MODE_UNDEFINED);

            final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();

                wct.setBounds(request.getTriggerTask().token, destinationBounds);

            }

            return wct;

        } else {

            return null;

            outWCT.setBounds(request.getTriggerTask().token, destinationBounds);

        }

    }
@@ -559,92 +569,94 @@ public class PipTransition extends PipTransitionController { 
    }



    /** Whether we should handle the given {@link TransitionInfo} animation as entering PIP. */

    private static boolean isEnteringPip(@NonNull TransitionInfo info,

            @Nullable WindowContainerToken currentPipTaskToken) {

    private boolean isEnteringPip(@NonNull TransitionInfo info) {

        for (int i = info.getChanges().size() - 1; i >= 0; --i) {

            final TransitionInfo.Change change = info.getChanges().get(i);

            if (isEnteringPip(change, info.getType())) return true;

        }

        return false;

    }



    /** Whether a particular change is a window that is entering pip. */

    @Override

    public boolean isEnteringPip(@NonNull TransitionInfo.Change change,

            @WindowManager.TransitionType int transitType) {

        if (change.getTaskInfo() != null

                && change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_PINNED

                    && !change.getContainer().equals(currentPipTaskToken)) {

                && !change.getContainer().equals(mCurrentPipTaskToken)) {

            // We support TRANSIT_PIP type (from RootWindowContainer) or TRANSIT_OPEN (from apps

            // that enter PiP instantly on opening, mostly from CTS/Flicker tests)

                if (info.getType() == TRANSIT_PIP || info.getType() == TRANSIT_OPEN) {

            if (transitType == TRANSIT_PIP || transitType == TRANSIT_OPEN) {

                return true;

            }

            // This can happen if the request to enter PIP happens when we are collecting for

            // another transition, such as TRANSIT_CHANGE (display rotation).

                if (info.getType() == TRANSIT_CHANGE) {

            if (transitType == TRANSIT_CHANGE) {

                return true;

            }



            // Please file a bug to handle the unexpected transition type.

            throw new IllegalStateException("Entering PIP with unexpected transition type="

                        + transitTypeToString(info.getType()));

            }

                    + transitTypeToString(transitType));

        }

        return false;

    }



    private boolean startEnterAnimation(@NonNull TransitionInfo info,

    private void startEnterAnimation(@NonNull TransitionInfo info,

            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        // Search for an Enter PiP transition (along with a show wallpaper one)

        // Search for an Enter PiP transition

        TransitionInfo.Change enterPip = null;

        TransitionInfo.Change wallpaper = null;

        for (int i = info.getChanges().size() - 1; i >= 0; --i) {

            final TransitionInfo.Change change = info.getChanges().get(i);

            if (change.getTaskInfo() != null

                    && change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_PINNED) {

                enterPip = change;

            } else if ((change.getFlags() & FLAG_IS_WALLPAPER) != 0) {

                wallpaper = change;

            }

        }

        if (enterPip == null) {

            return false;

        }

        // Keep track of the PIP task.

        mCurrentPipTaskToken = enterPip.getContainer();

        mHasFadeOut = false;



        if (mFinishCallback != null) {

            callFinishCallback(null /* wct */);

            mFinishTransaction = null;

            throw new RuntimeException("Previous callback not called, aborting entering PIP.");

            throw new IllegalStateException("Trying to start PiP animation without a pip"

                    + "participant");

        }



        // Show the wallpaper if there is a wallpaper change.

        if (wallpaper != null) {

            startTransaction.show(wallpaper.getLeash());

            startTransaction.setAlpha(wallpaper.getLeash(), 1.f);

        }

        // Make sure other open changes are visible as entering PIP. Some may be hidden in

        // Transitions#setupStartState because the transition type is OPEN (such as auto-enter).

        for (int i = info.getChanges().size() - 1; i >= 0; --i) {

            final TransitionInfo.Change change = info.getChanges().get(i);

            if (change == enterPip || change == wallpaper) {

                continue;

            }

            if (change == enterPip) continue;

            if (isOpeningType(change.getMode())) {

                final SurfaceControl leash = change.getLeash();

                startTransaction.show(leash).setAlpha(leash, 1.f);

            }

        }



        startEnterAnimation(enterPip, startTransaction, finishTransaction, finishCallback);

    }



    @Override

    public void startEnterAnimation(@NonNull final TransitionInfo.Change pipChange,

            @NonNull final SurfaceControl.Transaction startTransaction,

            @NonNull final SurfaceControl.Transaction finishTransaction,

            @NonNull final Transitions.TransitionFinishCallback finishCallback) {

        if (mFinishCallback != null) {

            callFinishCallback(null /* wct */);

            mFinishTransaction = null;

            throw new RuntimeException("Previous callback not called, aborting entering PIP.");

        }



        // Keep track of the PIP task and animation.

        mCurrentPipTaskToken = pipChange.getContainer();

        mHasFadeOut = false;

        mPipTransitionState.setTransitionState(PipTransitionState.ENTERING_PIP);

        mFinishCallback = finishCallback;

        mFinishTransaction = finishTransaction;

        final int endRotation = mInFixedRotation ? mEndFixedRotation : enterPip.getEndRotation();

        return startEnterAnimation(enterPip.getTaskInfo(), enterPip.getLeash(),

                startTransaction, finishTransaction, enterPip.getStartRotation(),

                endRotation);

    }



    private boolean startEnterAnimation(final TaskInfo taskInfo, final SurfaceControl leash,

            final SurfaceControl.Transaction startTransaction,

            final SurfaceControl.Transaction finishTransaction,

            final int startRotation, final int endRotation) {

        final ActivityManager.RunningTaskInfo taskInfo = pipChange.getTaskInfo();

        final SurfaceControl leash = pipChange.getLeash();

        final int startRotation = pipChange.getStartRotation();

        final int endRotation = mInFixedRotation ? mEndFixedRotation : pipChange.getEndRotation();



        setBoundsStateForEntry(taskInfo.topActivity, taskInfo.pictureInPictureParams,

                taskInfo.topActivityInfo);

        final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();
@@ -657,7 +669,6 @@ public class PipTransition extends PipTransitionController { 
            computeEnterPipRotatedBounds(rotationDelta, startRotation, endRotation, taskInfo,

                    destinationBounds, sourceHintRect);

        }

        PipAnimationController.PipTransitionAnimator animator;

        // Set corner radius for entering pip.

        mSurfaceTransactionHelper

                .crop(finishTransaction, leash, destinationBounds)
@@ -694,7 +705,7 @@ public class PipTransition extends PipTransitionController { 
                        null /* callback */, false /* withStartDelay */);

            }

            mPipTransitionState.setInSwipePipToHomeTransition(false);

            return true;

            return;

        }



        if (rotationDelta != Surface.ROTATION_0) {
@@ -702,6 +713,12 @@ public class PipTransition extends PipTransitionController { 
            tmpTransform.postRotate(rotationDelta);

            startTransaction.setMatrix(leash, tmpTransform, new float[9]);

        }

        if (mOneShotAnimationType == ANIM_TYPE_ALPHA) {

            startTransaction.setAlpha(leash, 0f);

        }

        startTransaction.apply();



        PipAnimationController.PipTransitionAnimator animator;

        if (mOneShotAnimationType == ANIM_TYPE_BOUNDS) {

            animator = mPipAnimationController.getAnimator(taskInfo, leash, currentBounds,

                    currentBounds, destinationBounds, sourceHintRect, TRANSITION_DIRECTION_TO_PIP,
@@ -712,7 +729,6 @@ public class PipTransition extends PipTransitionController { 
                animator.setUseContentOverlay(mContext);

            }

        } else if (mOneShotAnimationType == ANIM_TYPE_ALPHA) {

            startTransaction.setAlpha(leash, 0f);

            animator = mPipAnimationController.getAnimator(taskInfo, leash, destinationBounds,

                    0f, 1f);

            mOneShotAnimationType = ANIM_TYPE_BOUNDS;
@@ -720,7 +736,6 @@ public class PipTransition extends PipTransitionController { 
            throw new RuntimeException("Unrecognized animation type: "

                    + mOneShotAnimationType);

        }

        startTransaction.apply();

        animator.setTransitionDirection(TRANSITION_DIRECTION_TO_PIP)

                .setPipAnimationCallback(mPipAnimationCallback)

                .setDuration(mEnterExitAnimationDuration);
@@ -731,8 +746,6 @@ public class PipTransition extends PipTransitionController { 
            animator.setDestinationBounds(mPipBoundsAlgorithm.getEntryDestinationBounds());

        }

        animator.start();



        return true;

    }



    /** Computes destination bounds in old rotation and updates source hint rect if available. */

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

+31 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.wm.shell.pip;



import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.view.WindowManager.TRANSIT_PIP;



import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_REMOVE_STACK;

import static com.android.wm.shell.pip.PipAnimationController.isInPipDirection;
@@ -28,10 +29,16 @@ import android.content.ComponentName; 
import android.content.pm.ActivityInfo;

import android.graphics.Rect;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.window.TransitionInfo;

import android.window.TransitionRequestInfo;

import android.window.WindowContainerTransaction;



import androidx.annotation.NonNull;



import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.transition.Transitions;
@@ -206,6 +213,30 @@ public abstract class PipTransitionController implements Transitions.TransitionH 
        return false;

    }



    /** @return whether the transition-request represents a pip-entry. */

    public boolean requestHasPipEnter(@NonNull TransitionRequestInfo request) {

        return request.getType() == TRANSIT_PIP;

    }



    /** Whether a particular change is a window that is entering pip. */

    public boolean isEnteringPip(@NonNull TransitionInfo.Change change,

            @WindowManager.TransitionType int transitType) {

        return false;

    }



    /** Add PiP-related changes to `outWCT` for the given request. */

    public void augmentRequest(@NonNull IBinder transition,

            @NonNull TransitionRequestInfo request, @NonNull WindowContainerTransaction outWCT) {

        throw new IllegalStateException("Request isn't entering PiP");

    }



    /** Play a transition animation for entering PiP on a specific PiP change. */

    public void startEnterAnimation(@NonNull final TransitionInfo.Change pipChange,

            @NonNull final SurfaceControl.Transaction startTransaction,

            @NonNull final SurfaceControl.Transaction finishTransaction,

            @NonNull final Transitions.TransitionFinishCallback finishCallback) {

    }



    /**

     * Callback interface for PiP transitions (both from and to PiP mode)

     */

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

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.wm.shell.pip.PipAnimationController; 
import com.android.wm.shell.pip.PipBoundsAlgorithm;

import com.android.wm.shell.pip.PipBoundsState;

import com.android.wm.shell.pip.PipTaskOrganizer;

import com.android.wm.shell.pip.PipTransitionController;

import com.android.wm.shell.pip.PipUiEventLogger;

import com.android.wm.shell.protolog.ShellProtoLogGroup;
@@ -249,6 +250,10 @@ public class PipTouchHandler { 
                });

    }



    public PipTransitionController getTransitionHandler() {

        return mPipTaskOrganizer.getTransitionController();

    }



    private void reloadResources() {

        final Resources res = mContext.getResources();

        mBottomOffsetBufferPx = res.getDimensionPixelSize(R.dimen.pip_bottom_offset_buffer);