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

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

Merge changes from topic "presubmit-am-8fe06d94db0b4326ab412885caecafc6" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] DO NOT MERGE Fix divider animation from overview screen 2p: 7214fd7e
  DO NOT MERGE Fix divider animation from overview screen
parents 262d042c 65988b4b

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

+5 −1
Original line number Diff line number Diff line
@@ -365,8 +365,10 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    void startTasksWithLegacyTransition(int mainTaskId, @Nullable Bundle mainOptions,

            int sideTaskId, @Nullable Bundle sideOptions, @SplitPosition int sidePosition,

            float splitRatio, RemoteAnimationAdapter adapter) {

        // Ensure divider is invisible before transition.

        setDividerVisibility(false /* visible */);

        // Init divider first to make divider leash for remote animation target.

        setDividerVisibility(true /* visible */);

        mSplitLayout.init();

        // Set false to avoid record new bounds with old task still on top;

        mShouldUpdateRecents = false;

        final WindowContainerTransaction wct = new WindowContainerTransaction();
@@ -396,6 +398,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                            public void onAnimationFinished() throws RemoteException {

                                mIsDividerRemoteAnimating = false;

                                mShouldUpdateRecents = true;

                                setDividerVisibility(true /* visible */);

                                mSyncQueue.queue(evictWct);

                                mSyncQueue.runInSync(t -> applyDividerVisibility(t));

                                finishedCallback.onAnimationFinished();
@@ -420,6 +423,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            public void onAnimationCancelled() {

                mIsDividerRemoteAnimating = false;

                mShouldUpdateRecents = true;

                setDividerVisibility(true /* visible */);

                mSyncQueue.queue(evictWct);

                mSyncQueue.runInSync(t -> applyDividerVisibility(t));

                try {