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

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

Merge "Use TYPE_ENTER_PIP_FROM_SPLIT only if the task is on split" into... 

Merge "Use TYPE_ENTER_PIP_FROM_SPLIT only if the task is on split" into udc-dev am: 9d2d6d1f am: d59b1caa

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



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

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

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 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;
@@ -172,7 +173,9 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
    @Override

    public WindowContainerTransaction handleRequest(@NonNull IBinder transition,

            @NonNull TransitionRequestInfo request) {

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

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

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

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

            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) {