Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d08215 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

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

parents ca7fbaac c2d96c31

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

+2 −1
Original line number Diff line number Diff line
@@ -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