Merge "Do not set side stage position" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a85de1fbc6
@@ -2324,7 +2324,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
|
|||||||
} else if (!isSplitScreenVisible() && isOpening) {
|
} else if (!isSplitScreenVisible() && isOpening) {
|
||||||
// If split is running in the background and the trigger task is appearing into
|
// If split is running in the background and the trigger task is appearing into
|
||||||
// split, prepare to enter split screen.
|
// split, prepare to enter split screen.
|
||||||
setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, out);
|
|
||||||
prepareEnterSplitScreen(out);
|
prepareEnterSplitScreen(out);
|
||||||
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
|
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
|
||||||
TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
|
TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
|
||||||
@@ -2350,7 +2349,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
|
|||||||
if (isOpening && getStageOfTask(triggerTask) != null) {
|
if (isOpening && getStageOfTask(triggerTask) != null) {
|
||||||
// One task is appearing into split, prepare to enter split screen.
|
// One task is appearing into split, prepare to enter split screen.
|
||||||
out = new WindowContainerTransaction();
|
out = new WindowContainerTransaction();
|
||||||
setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, out);
|
|
||||||
prepareEnterSplitScreen(out);
|
prepareEnterSplitScreen(out);
|
||||||
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
|
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
|
||||||
TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
|
TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
|
||||||
|
|||||||
Reference in New Issue
Block a user