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

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

Merge "Fix launch existing split pair fail after unfold device" into tm-qpr-dev am: 60135eb2 

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



Change-Id: I39b4979551612384f86e7e30c35985a921a9a446
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df84163a 60135eb2

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

+5 −4
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                        new IRemoteAnimationFinishedCallback.Stub() {

                            @Override

                            public void onAnimationFinished() throws RemoteException {

                                onRemoteAnimationFinishedOrCancelled(evictWct);

                                onRemoteAnimationFinishedOrCancelled(false /* cancel */, evictWct);

                                finishedCallback.onAnimationFinished();

                            }

                        };
@@ -463,7 +463,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 


            @Override

            public void onAnimationCancelled(boolean isKeyguardOccluded) {

                onRemoteAnimationFinishedOrCancelled(evictWct);

                onRemoteAnimationFinishedOrCancelled(true /* cancel */, evictWct);

                try {

                    adapter.getRunner().onAnimationCancelled(isKeyguardOccluded);

                } catch (RemoteException e) {
@@ -513,13 +513,14 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        });

    }



    private void onRemoteAnimationFinishedOrCancelled(WindowContainerTransaction evictWct) {

    private void onRemoteAnimationFinishedOrCancelled(boolean cancel,

            WindowContainerTransaction evictWct) {

        mIsDividerRemoteAnimating = false;

        mShouldUpdateRecents = true;

        // If any stage has no child after animation finished, it means that split will display

        // nothing, such status will happen if task and intent is same app but not support

        // multi-instagce, we should exit split and expand that app as full screen.

        if (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0) {

        if (!cancel && (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0)) {

            mMainExecutor.execute(() ->

                    exitSplitScreen(mMainStage.getChildCount() == 0

                        ? mSideStage : mMainStage, EXIT_REASON_UNKNOWN));