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

Commit 7b099a6f 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... 

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

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



Change-Id: Ieb8f5fdf9f3c0ad793e5f044f3839d3abf4bbbcd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 754ae1a9 4f38d3bc

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

+5 −4
Original line number 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.

            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;

            }

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

            callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false);

        });



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

        return true;

    }