Merge "Do not add divider to dismiss transition" into udc-dev (eee7c251) · Commits · e / os / android_frameworks_base

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;
		}