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

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

Merge "Do not add divider to dismiss transition" into udc-dev am: eee7c251 am: ef033149 

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



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

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

+5 −4
Original line number Diff line number Diff line
@@ -2543,8 +2543,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            // handling to the mixed-handler to deal with splitting it up.

            if (mMixedHandler.animatePendingSplitWithDisplayChange(transition, info,

                    startTransaction, finishTransaction, finishCallback)) {

                if (mSplitTransitions.isPendingResize(transition)) {

                    // Only need to update in resize because divider exist before transition.

                    mSplitLayout.update(startTransaction);

                    startTransaction.apply();

                }

                return true;

            }

        }
@@ -2913,8 +2916,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mSideStage.getSplitDecorManager().release(callbackT);

            callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false);

        });



        addDividerBarToTransition(info, false /* show */);

        return true;

    }