Merge "Revert "Run normal finish for entering standalone recents activity"" into main (b3550a95) · Commits · e / os / android_frameworks_base

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

+13 −11

Original line number	Original line	Diff line number	Diff line
	@@ -925,8 +925,19 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
	if (toHome) wct.reorder(mRecentsTask, true /* toTop */);		if (toHome) wct.reorder(mRecentsTask, true /* toTop */);
	else wct.restoreTransientOrder(mRecentsTask);		else wct.restoreTransientOrder(mRecentsTask);
	}		}
	if (!toHome && !mWillFinishToHome && mPausingTasks != null && mState == STATE_NORMAL) {		if (!toHome
	ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, " returning to app");		// If a recents gesture starts on the 3p launcher, then the 3p launcher is the
			// live tile (pausing app). If the gesture is "cancelled" we need to return to
			// 3p launcher instead of "task-switching" away from it.
			&& (!mWillFinishToHome \|\| mPausingSeparateHome)
			&& mPausingTasks != null && mState == STATE_NORMAL) {
			if (mPausingSeparateHome) {
			ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
			" returning to 3p home");
			} else {
			ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
			" returning to app");
			}
	// The gesture is returning to the pausing-task(s) rather than continuing with		// The gesture is returning to the pausing-task(s) rather than continuing with
	// recents, so end the transition by moving the app back to the top (and also		// recents, so end the transition by moving the app back to the top (and also
	// re-showing it's task).		// re-showing it's task).
	@@ -958,15 +969,6 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
	wct.restoreTransientOrder(mRecentsTask);		wct.restoreTransientOrder(mRecentsTask);
	}		}
	} else {		} else {
	if (mPausingSeparateHome) {
	if (mOpeningTasks.isEmpty()) {
	ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
	" recents occluded 3p home");
	} else {
	ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
	" switch task by recents on 3p home");
	}
	}
	ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, " normal finish");		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, " normal finish");
	// The general case: committing to recents, going home, or switching tasks.		// The general case: committing to recents, going home, or switching tasks.
	for (int i = 0; i < mOpeningTasks.size(); ++i) {		for (int i = 0; i < mOpeningTasks.size(); ++i) {