Merge "Change logic to check recents bookend transition flag" into main (60c19d64) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		break;
		}
		}
		final int transitionType = Flags.enableShellTopTaskTracking()
		final int transitionType = Flags.enableRecentsBookendTransition()
		? TRANSIT_START_RECENTS_TRANSITION
		: TRANSIT_TO_FRONT;
		final IBinder transition = mTransitions.startTransition(transitionType,
		@@ -920,7 +920,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		return;
		}

		if (Flags.enableShellTopTaskTracking()
		if (Flags.enableRecentsBookendTransition()
		&& info.getType() == TRANSIT_END_RECENTS_TRANSITION
		&& mergeTarget == mTransition) {
		// This is a pending finish, so merge the end transition to trigger completing the
		@@ -1290,8 +1290,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		return;
		}

		if (mFinishCB == null
		\|\| (Flags.enableShellTopTaskTracking() && mPendingFinishTransition != null)) {
		if (mFinishCB == null \|\| (Flags.enableRecentsBookendTransition()
		&& mPendingFinishTransition != null)) {
		Slog.e(TAG, "Duplicate call to finish");
		if (runnerFinishCb != null) {
		try {
		@@ -1310,7 +1310,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		&& !mWillFinishToHome
		&& mPausingTasks != null
		&& mState == STATE_NORMAL;
		if (!Flags.enableShellTopTaskTracking()) {
		if (!Flags.enableRecentsBookendTransition()) {
		// This is only necessary when the recents transition is finished using a finishWCT,
		// otherwise a new transition will notify the relevant observers
		if (returningToApp && allAppsAreTranslucent(mPausingTasks)) {
		@@ -1443,7 +1443,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		// We need to clear the WCT to send finishWCT=null for Recents.
		wct.clear();

		if (Flags.enableShellTopTaskTracking()) {
		if (Flags.enableRecentsBookendTransition()) {
		// In this case, we've already started the PIP transition, so we can
		// clean up immediately
		mPendingRunnerFinishCb = runnerFinishCb;
		@@ -1455,7 +1455,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		}
		}

		if (Flags.enableShellTopTaskTracking()) {
		if (Flags.enableRecentsBookendTransition()) {
		if (!wct.isEmpty()) {
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
		"[%d] RecentsController.finishInner: "
		@@ -1574,7 +1574,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		/**
		* A temporary transition handler used with the pending finish transition, which runs the
		* cleanup/finish logic once the pending transition is merged/handled.
		* This is only initialized if Flags.enableShellTopTaskTracking() is enabled.
		* This is only initialized if Flags.enableRecentsBookendTransition() is enabled.
		*/
		private class PendingFinishTransitionHandler implements Transitions.TransitionHandler {
		@Override

services/core/java/com/android/server/wm/WindowOrganizerController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1380,7 +1380,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		break;
		}
		case HIERARCHY_OP_TYPE_RESTORE_TRANSIENT_ORDER: {
		if (!com.android.wm.shell.Flags.enableShellTopTaskTracking()) {
		if (!com.android.wm.shell.Flags.enableRecentsBookendTransition()) {
		// Only allow restoring transient order when finishing a transition
		if (!chain.isFinishing()) break;
		}
		@@ -1416,7 +1416,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		final TaskDisplayArea taskDisplayArea = thisTask.getTaskDisplayArea();
		taskDisplayArea.moveRootTaskBehindRootTask(thisTask.getRootTask(), restoreAt);

		if (com.android.wm.shell.Flags.enableShellTopTaskTracking()) {
		if (com.android.wm.shell.Flags.enableRecentsBookendTransition()) {
		// Because we are in a transient launch transition, the requested visibility of
		// tasks does not actually change for the transient-hide tasks, but we do want
		// the restoration of these transient-hide tasks to top to be a part of this