Merge "Not to update recent tasks split pairs when shell transition enabled" into tm-qpr-dev

This commit is contained in:
Chilun Huang
2022-08-30 08:54:13 +00:00
committed by Android (Google) Code Review

View File

@@ -105,8 +105,8 @@ public class FullscreenTaskListener<T extends AutoCloseable>
state.mTaskInfo = taskInfo; state.mTaskInfo = taskInfo;
mTasks.put(taskInfo.taskId, state); mTasks.put(taskInfo.taskId, state);
updateRecentsForVisibleFullscreenTask(taskInfo);
if (Transitions.ENABLE_SHELL_TRANSITIONS) return; if (Transitions.ENABLE_SHELL_TRANSITIONS) return;
updateRecentsForVisibleFullscreenTask(taskInfo);
if (shouldShowWindowDecor(taskInfo) && mWindowDecorViewModelOptional.isPresent()) { if (shouldShowWindowDecor(taskInfo) && mWindowDecorViewModelOptional.isPresent()) {
SurfaceControl.Transaction t = new SurfaceControl.Transaction(); SurfaceControl.Transaction t = new SurfaceControl.Transaction();
state.mWindowDecoration = state.mWindowDecoration =
@@ -135,8 +135,8 @@ public class FullscreenTaskListener<T extends AutoCloseable>
mWindowDecorViewModelOptional.get().onTaskInfoChanged( mWindowDecorViewModelOptional.get().onTaskInfoChanged(
state.mTaskInfo, state.mWindowDecoration); state.mTaskInfo, state.mWindowDecoration);
} }
updateRecentsForVisibleFullscreenTask(taskInfo);
if (Transitions.ENABLE_SHELL_TRANSITIONS) return; if (Transitions.ENABLE_SHELL_TRANSITIONS) return;
updateRecentsForVisibleFullscreenTask(taskInfo);
final Point positionInParent = state.mTaskInfo.positionInParent; final Point positionInParent = state.mTaskInfo.positionInParent;
if (!oldPositionInParent.equals(state.mTaskInfo.positionInParent)) { if (!oldPositionInParent.equals(state.mTaskInfo.positionInParent)) {