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

Commit 28c2d970 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Fix seeing "punch-hole" split-tasks when switching tasks from recents"... 

Merge "Fix seeing "punch-hole" split-tasks when switching tasks from recents" into tm-qpr-dev am: d70fb2c4 am: dcda23ec

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



Change-Id: Id8bb702c2c259f0a51e9170424da03790e62816f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1719284 dcda23ec

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+3 −2
Original line number Diff line number Diff line
@@ -1448,8 +1448,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    // Enter overview panel, so start recent transition.

                    mSplitTransitions.setRecentTransition(transition,

                            request.getRemoteTransition());

                } else {

                    // Occluded by the other fullscreen task, so dismiss both.

                } else if (mSplitTransitions.mPendingRecent == null) {

                    // If split-task is not controlled by recents animation

                    // and occluded by the other fullscreen task, dismiss both.

                    prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, out);

                    mSplitTransitions.setDismissTransition(transition,

                            STAGE_TYPE_UNDEFINED, EXIT_REASON_UNKNOWN);