Merge "Fix an issue where swiping up on the bubble bar would take you home" into udc-qpr-dev

This commit is contained in:
Mady Mellor
2023-06-28 20:42:44 +00:00
committed by Android (Google) Code Review

View File

@@ -567,7 +567,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
&& taskInfo.configuration.windowConfiguration.isAlwaysOnTop()) {
// Tasks that are always on top (e.g. bubbles), will handle their own transition
// as they are on top of everything else. So cancel the merge here.
cancel("task #" + taskInfo.taskId + " is always_on_top");
cancel(false /* toHome */, false /* withScreenshots */,
"task #" + taskInfo.taskId + " is always_on_top");
return;
}
final boolean isRootTask = taskInfo != null