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

Commit a7dfb13e authored by mattsziklay's avatar mattsziklay Committed by Matt Sziklay
Browse files

Restrict moveToSplit calls to freeform tasks. 

The SplitScreenListener registered to desktop mode interferes with
the animation of moving tasks into split stage from recents. Restricting
it to freeform tasks restores the animation without impacting desktop
mode animations.

Bug: 338382550
Test: Manual, move to recents from one split pair, enter a second split pair, confirm animation plays. Confirm desktop functionality unaffected.
Change-Id: I0c17c6e14b2bcec18d5e3822f0437e11cbb5a73f
parent f1908787

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+4 −2
Original line number Diff line number Diff line
@@ -278,9 +278,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            public void onTaskStageChanged(int taskId, @StageType int stage, boolean visible) {

                if (visible && stage != STAGE_TYPE_UNDEFINED) {

                    DesktopModeWindowDecoration decor = mWindowDecorByTaskId.get(taskId);

                    if (decor != null && DesktopModeStatus.canEnterDesktopMode(mContext)) {

                        mDesktopTasksController.moveToSplit(decor.mTaskInfo);

                    if (decor == null || !DesktopModeStatus.canEnterDesktopMode(mContext)

                            || decor.mTaskInfo.getWindowingMode() != WINDOWING_MODE_FREEFORM) {

                        return;

                    }

                    mDesktopTasksController.moveToSplit(decor.mTaskInfo);

                }

            }

        });