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

Commit 3577d296 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Improve exit transition for task close case" into tm-qpr-dev am:... 

Merge "Improve exit transition for task close case" into tm-qpr-dev am: 2e075980 am: 8790168a am: 6e59a203 am: c0b75914

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



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

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+4 −0
Original line number Diff line number Diff line
@@ -738,6 +738,10 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        getRefBounds2(mTempRect);

        t.setPosition(leash2, mTempRect.left, mTempRect.top)

                .setWindowCrop(leash2, mTempRect.width(), mTempRect.height());

        // Make right or bottom side surface always higher than left or top side to avoid weird

        // animation when dismiss split. e.g. App surface fling above on decor surface.

        t.setLayer(leash1, 1);

        t.setLayer(leash2, 2);



        if (mImePositionProcessor.adjustSurfaceLayoutForIme(

                t, dividerLeash, leash1, leash2, dimLayer1, dimLayer2)) {

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

+12 −4
Original line number Diff line number Diff line
@@ -220,12 +220,20 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
                mCallbacks.onNoLongerSupportMultiWindow();

                return;

            }

            if (taskInfo.topActivity == null && mChildrenTaskInfo.contains(taskInfo.taskId)

                    && mChildrenTaskInfo.get(taskInfo.taskId).topActivity != null) {

                // If top activity become null, it means the task is about to vanish, we use this

                // signal to remove it from children list earlier for smooth dismiss transition.

                mChildrenTaskInfo.remove(taskInfo.taskId);

                mChildrenLeashes.remove(taskInfo.taskId);

            } else {

                mChildrenTaskInfo.put(taskInfo.taskId, taskInfo);

            }

            mCallbacks.onChildTaskStatusChanged(taskInfo.taskId, true /* present */,

                    taskInfo.isVisible);

            if (!ENABLE_SHELL_TRANSITIONS) {

                updateChildTaskSurface(

                        taskInfo, mChildrenLeashes.get(taskInfo.taskId), false /* firstAppeared */);

            if (!ENABLE_SHELL_TRANSITIONS && mChildrenLeashes.contains(taskInfo.taskId)) {

                updateChildTaskSurface(taskInfo, mChildrenLeashes.get(taskInfo.taskId),

                        false /* firstAppeared */);

            }

        } else {

            throw new IllegalArgumentException(this + "\n Unknown task: " + taskInfo