From c2d96c31d99a913b7a0e95c4724f1debc35bcde6 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Fri, 23 Jun 2023 16:14:58 -0700 Subject: [PATCH] Fix an issue where swiping up on the bubble bar would take you home Test: manual - enable bubble bar, have bubbles - open an app - swipe up on the bubble bar => observe that bubbles expand and you don't go home so the app below bubbles remains open Bug: 276981866 Change-Id: I3e89f4486287376eaea3e3111704ce71799a2da4 --- .../com/android/wm/shell/recents/RecentsTransitionHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 843e5af67af92..837f11803ab2f 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