diff options
| author | 2023-06-28 20:42:44 +0000 | |
|---|---|---|
| committer | 2023-06-28 20:42:44 +0000 | |
| commit | 89d08215d5994f151c028fa6ad6ba953484d7784 (patch) | |
| tree | 13ba1819cbb285c6a5517196a67314d3b4d07977 | |
| parent | ca7fbaac468f63ae334a825d004ccb0123e09459 (diff) | |
| parent | c2d96c31d99a913b7a0e95c4724f1debc35bcde6 (diff) | |
Merge "Fix an issue where swiping up on the bubble bar would take you home" into udc-qpr-dev
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index 843e5af67af9..837f11803ab2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -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 |