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

Commit ef033149 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 

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



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

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;

    }