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

Commit da2b617b authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Update the visibility of split to invisible" into udc-dev am:... 

Merge "Update the visibility of split to invisible" into udc-dev am: f05be869 am: 67fc9efd am: 2db2e928

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



Change-Id: Icea1951ed71755ef9ae3d35f60f3dc6351528bf7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0feee23c 2db2e928

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

+6 −1
Original line number Diff line number Diff line
@@ -2899,6 +2899,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    /** Call this when the recents animation canceled during split-screen. */

    public void onRecentsInSplitAnimationCanceled() {

        mPausingTasks.clear();

        setSplitsVisible(false);



        final WindowContainerTransaction wct = new WindowContainerTransaction();

        wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,

                true /* reparentLeafTaskIfRelaunch */);

        mTaskOrganizer.applyTransaction(wct);

    }



    /** Call this when the recents animation during split-screen finishes. */
@@ -2925,7 +2931,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        setSplitsVisible(false);

        finishWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,

                true /* reparentLeafTaskIfRelaunch */);

        logExit(EXIT_REASON_UNKNOWN);

    }



    /** Call this when the recents animation finishes by doing pair-to-pair switch. */