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

Commit dfbb302e 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: Ie896a5aae73e904c13adc70f2f803e50027c10c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc5de087 ef033149

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

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

            // handling to the mixed-handler to deal with splitting it up.

            if (mMixedHandler.animatePendingSplitWithDisplayChange(transition, info,

            if (mMixedHandler.animatePendingSplitWithDisplayChange(transition, info,

                    startTransaction, finishTransaction, finishCallback)) {

                    startTransaction, finishTransaction, finishCallback)) {

                if (mSplitTransitions.isPendingResize(transition)) {

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

                    mSplitLayout.update(startTransaction);

                    mSplitLayout.update(startTransaction);

                    startTransaction.apply();

                    startTransaction.apply();

                }

                return true;

                return true;

            }

            }

        }

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

            mSideStage.getSplitDecorManager().release(callbackT);

            callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false);

            callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false);

        });

        });



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

        return true;

        return true;

    }

    }