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

Commit d4f44d5e authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix swipe-to-home not enter pip from split properly" into udc-dev am:... 

Merge "Fix swipe-to-home not enter pip from split properly" into udc-dev am: 66204956 am: 6a72e521

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



Change-Id: Id4700baa0b59392466936d252f7d52fe0c782dfc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b810001 6a72e521

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+21 −0
Original line number Diff line number Diff line
@@ -378,6 +378,27 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        return mMainStage.isActive();

    }



    /** @return whether the transition-request implies entering pip from split. */

    public boolean requestImpliesSplitToPip(TransitionRequestInfo request) {

        if (!isSplitActive() || !mMixedHandler.requestHasPipEnter(request)) {

            return false;

        }



        if (request.getTriggerTask() != null && getSplitPosition(

                request.getTriggerTask().taskId) != SPLIT_POSITION_UNDEFINED) {

            return true;

        }



        // If one of the splitting tasks support auto-pip, wm-core might reparent the task to TDA

        // and file a TRANSIT_PIP transition when finishing transitions.

        // @see com.android.server.wm.RootWindowContainer#moveActivityToPinnedRootTask

        if (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0) {

            return true;

        }



        return false;

    }



    /** Checks if `transition` is a pending enter-split transition. */

    public boolean isPendingEnter(IBinder transition) {

        return mSplitTransitions.isPendingEnter(transition);

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+6 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.view.WindowManager.TRANSIT_TO_BACK; 
import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;



import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;

import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED;

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

import static com.android.wm.shell.util.TransitionUtil.isOpeningType;
@@ -179,9 +178,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
    @Override

    public WindowContainerTransaction handleRequest(@NonNull IBinder transition,

            @NonNull TransitionRequestInfo request) {

        if (mPipHandler.requestHasPipEnter(request) && mSplitHandler.isSplitActive()

                && request.getTriggerTask() != null && mSplitHandler.getSplitItemPosition(

                        request.getTriggerTask().token) != SPLIT_POSITION_UNDEFINED) {

        if (mSplitHandler.requestImpliesSplitToPip(request)) {

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a PiP-enter request while "

                    + "Split-Screen is active, so treat it as Mixed.");

            if (request.getRemoteTransition() != null) {
@@ -698,6 +695,11 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
        return false;

    }



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

    public boolean requestHasPipEnter(TransitionRequestInfo request) {

        return mPipHandler.requestHasPipEnter(request);

    }



    @Override

    public void mergeAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info,

            @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget,