From ef1081e3d236d039b5077ea29086a8595dab0c84 Mon Sep 17 00:00:00 2001 From: Chilun Huang Date: Mon, 29 Aug 2022 22:08:16 +0800 Subject: [PATCH] Not to update recent tasks split pairs when shell transition enabled onTaskAppeared() and onTaskInfoChanged() should not update recent tasks split pairs when shell transition enabled. Bug: 244132711 Test: Manually check if the split pairs exist after swipe to home. Change-Id: Ief5ae81909f6809727bf685c547e81599ff7d4ec --- .../android/wm/shell/fullscreen/FullscreenTaskListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java index 0d75bc451b72a..f1465f421c5bd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java @@ -105,8 +105,8 @@ public class FullscreenTaskListener state.mTaskInfo = taskInfo; mTasks.put(taskInfo.taskId, state); - updateRecentsForVisibleFullscreenTask(taskInfo); if (Transitions.ENABLE_SHELL_TRANSITIONS) return; + updateRecentsForVisibleFullscreenTask(taskInfo); if (shouldShowWindowDecor(taskInfo) && mWindowDecorViewModelOptional.isPresent()) { SurfaceControl.Transaction t = new SurfaceControl.Transaction(); state.mWindowDecoration = @@ -135,8 +135,8 @@ public class FullscreenTaskListener mWindowDecorViewModelOptional.get().onTaskInfoChanged( state.mTaskInfo, state.mWindowDecoration); } - updateRecentsForVisibleFullscreenTask(taskInfo); if (Transitions.ENABLE_SHELL_TRANSITIONS) return; + updateRecentsForVisibleFullscreenTask(taskInfo); final Point positionInParent = state.mTaskInfo.positionInParent; if (!oldPositionInParent.equals(state.mTaskInfo.positionInParent)) {