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

Commit 67fc9efd 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: f05be869 

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



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

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

+6 −1
Original line number Diff line number Diff line
@@ -2884,6 +2884,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. */
@@ -2910,7 +2916,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. */