Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge closing transition when recents is running" into udc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-04-27 10:28:39 +00:00
committed by Android (Google) Code Review
parent 688838f6b4 ac3dd218f8
commit c3a162302b
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,6 +549,14 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
// are in mOpening. // are in mOpening.
for (int i = 0; i < closingTasks.size(); ++i) { for (int i = 0; i < closingTasks.size(); ++i) {
final TransitionInfo.Change change = closingTasks.get(i); final TransitionInfo.Change change = closingTasks.get(i);
final int pausingIdx = TaskState.indexOf(mPausingTasks, change);
if (pausingIdx >= 0) {
mPausingTasks.remove(pausingIdx);
didMergeThings = true;
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
" closing pausing taskId=%d", change.getTaskInfo().taskId);
continue;
}
int openingIdx = TaskState.indexOf(mOpeningTasks, change); int openingIdx = TaskState.indexOf(mOpeningTasks, change);
if (openingIdx < 0) { if (openingIdx < 0) {
Slog.w(TAG, "Closing a task that wasn't opening, this may be split or" Slog.w(TAG, "Closing a task that wasn't opening, this may be split or"
@@ -601,6 +609,11 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
didMergeThings = true; didMergeThings = true;
mState = STATE_NEW_TASK; mState = STATE_NEW_TASK;
} }
if (mPausingTasks.isEmpty()) {
// The pausing tasks may be removed by the incoming closing tasks.
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
"[%d] RecentsController.merge: empty pausing tasks", mInstanceId);
}
if (!hasTaskChange) { if (!hasTaskChange) {
// Activity only transition, so consume the merge as it doesn't affect the rest of // Activity only transition, so consume the merge as it doesn't affect the rest of
// recents. // recents.