Merge "Polish home-key from split to pip transition" into udc-dev (c7a500cc) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -840,7 +840,7 @@ public class PipTransition extends PipTransitionController {
		}

		final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();
		final Rect currentBounds = taskInfo.configuration.windowConfiguration.getBounds();
		final Rect currentBounds = pipChange.getStartAbsBounds();
		int rotationDelta = deltaRotation(startRotation, endRotation);
		Rect sourceHintRect = PipBoundsAlgorithm.getValidSourceHintRect(
		taskInfo.pictureInPictureParams, currentBounds, destinationBounds);

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

+19 −9

Original line number	Diff line number	Diff line
		@@ -2841,19 +2841,25 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		}
		}

		if (shouldBreakPairedTaskInRecents(dismissReason)) {
		// Notify recents if we are exiting in a way that breaks the pair, and disable further
		// updates to splits in the recents until we enter split again
		mRecentTasks.ifPresent(recentTasks -> {
		final ArrayMap<Integer, SurfaceControl> dismissingTasks = new ArrayMap<>();
		for (int i = info.getChanges().size() - 1; i >= 0; --i) {
		final TransitionInfo.Change change = info.getChanges().get(i);
		final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();
		if (taskInfo != null && (getStageOfTask(taskInfo) != null
		\|\| getSplitItemPosition(change.getLastParent())
		!= SPLIT_POSITION_UNDEFINED)) {
		recentTasks.removeSplitPair(taskInfo.taskId);
		if (taskInfo == null) continue;
		if (getStageOfTask(taskInfo) != null
		\|\| getSplitItemPosition(change.getLastParent()) != SPLIT_POSITION_UNDEFINED) {
		dismissingTasks.put(taskInfo.taskId, change.getLeash());
		}
		}


		if (shouldBreakPairedTaskInRecents(dismissReason)) {
		// Notify recents if we are exiting in a way that breaks the pair, and disable further
		// updates to splits in the recents until we enter split again
		mRecentTasks.ifPresent(recentTasks -> {
		for (int i = dismissingTasks.keySet().size() - 1; i >= 0; --i) {
		recentTasks.removeSplitPair(dismissingTasks.keyAt(i));
		}
		});
		}
		mSplitRequest = null;
		@@ -2870,6 +2876,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		t.hide(toStage == STAGE_TYPE_MAIN ? mSideStage.mRootLeash : mMainStage.mRootLeash);
		t.setPosition(toStage == STAGE_TYPE_MAIN
		? mMainStage.mRootLeash : mSideStage.mRootLeash, 0, 0);
		} else {
		for (int i = dismissingTasks.keySet().size() - 1; i >= 0; --i) {
		finishT.hide(dismissingTasks.valueAt(i));
		}
		}

		if (toStage == STAGE_TYPE_UNDEFINED) {
		@@ -2879,7 +2889,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		}

		// Hide divider and dim layer on transition finished.
		setDividerVisibility(false, finishT);
		setDividerVisibility(false, t);
		finishT.hide(mMainStage.mDimLayer);
		finishT.hide(mSideStage.mDimLayer);
		}

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

		import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR;
		import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;
		import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA;
		import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED;
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_CHILD_TASK_ENTER_PIP;
		import static com.android.wm.shell.util.TransitionUtil.isOpeningType;
		@@ -477,6 +478,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler,
		}
		}

		mPipHandler.setEnterAnimationType(ANIM_TYPE_ALPHA);
		mPipHandler.startEnterAnimation(pipChange, startTransaction, finishTransaction,
		finishCB);
		// Dispatch the rest of the transition normally. This will most-likely be taken by