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

Commit 9b3a71fb authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix an issue where swiping up on the bubble bar would take you home"... 

Merge "Fix an issue where swiping up on the bubble bar would take you home" into udc-qpr-dev am: 89d08215 am: 5a31d5b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23793059



Change-Id: I659a6df9bd53ab56721549907bc91b3a0ef0fc95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd75dcb9 5a31d5b0

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -567,7 +567,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                        && taskInfo.configuration.windowConfiguration.isAlwaysOnTop()) {

                        && taskInfo.configuration.windowConfiguration.isAlwaysOnTop()) {

                    // Tasks that are always on top (e.g. bubbles), will handle their own transition

                    // 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.

                    // 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;

                    return;

                }

                }

                final boolean isRootTask = taskInfo != null

                final boolean isRootTask = taskInfo != null