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

Commit d7359e64 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-58a631437ba649c5a21ac129b7b6e719" into tm-qpr-dev-plus-aosp 

* changes:
  [automerge] Update the timing of clearing SplitRequest 2p: 7ae38cb0
  Update the timing of clearing SplitRequest
parents 1e2bbecb 20d06b2b

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

+13 −3
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private void onRemoteAnimationFinishedOrCancelled(WindowContainerTransaction evictWct) {

        mIsDividerRemoteAnimating = false;

        mShouldUpdateRecents = true;

        mSplitRequest = null;

        clearRequestIfPresented();

        // 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-instance, we should exit split and expand that app as full screen.
@@ -1054,7 +1054,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private void onRemoteAnimationFinished(RemoteAnimationTarget[] apps) {

        mIsDividerRemoteAnimating = false;

        mShouldUpdateRecents = true;

        mSplitRequest = null;

        clearRequestIfPresented();

        // If any stage has no child after finished animation, that side of the split will display

        // nothing. This might happen if starting the same app on the both sides while not

        // supporting multi-instance. Exit the split screen and expand that app to full screen.
@@ -1320,6 +1320,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        });

        mShouldUpdateRecents = false;

        mIsDividerRemoteAnimating = false;

        mSplitRequest = null;



        mSplitLayout.getInvisibleBounds(mTempRect1);

        if (childrenToTop == null || childrenToTop.getTopVisibleChildTaskId() == INVALID_TASK_ID) {
@@ -1412,6 +1413,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }

    }



    private void clearRequestIfPresented() {

        if (mSideStageListener.mVisible && mSideStageListener.mHasChildren

                && mMainStageListener.mVisible && mSideStageListener.mHasChildren) {

            mSplitRequest = null;

        }

    }



    /**

     * Returns whether the split pair in the recent tasks list should be broken.

     */
@@ -1776,6 +1784,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    true /* setReparentLeafTaskIfRelaunch */);

            setRootForceTranslucent(true, wct);

        } else {

            clearRequestIfPresented();

            wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,

                    false /* setReparentLeafTaskIfRelaunch */);

            setRootForceTranslucent(false, wct);
@@ -1926,7 +1935,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }

        if (mMainStageListener.mHasChildren && mSideStageListener.mHasChildren) {

            mShouldUpdateRecents = true;

            mSplitRequest = null;

            clearRequestIfPresented();

            updateRecentTasksSplitPair();



            if (!mLogger.hasStartedSession()) {
@@ -2565,6 +2574,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            }

        });

        mShouldUpdateRecents = false;

        mSplitRequest = null;



        // Update local states.

        setSplitsVisible(false);