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

Commit 89368a13 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Only handle transition requests in split if active and visible" into... 

Merge "Only handle transition requests in split if active and visible" into udc-dev am: b88da3e9 am: 53a5708a

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



Change-Id: I2e84b7bd88460bee2994c45f206e31da1a5fa9fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60095ea4 53a5708a

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

+6 −1
Original line number Diff line number Diff line
@@ -2377,6 +2377,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, out);

                }

            }



            // When split in the background, it should be only opening/dismissing transition and

            // would keep out not empty. Prevent intercepting all transitions for split screen when

            // it is in the background and not identify to handle it.

            return (!out.isEmpty() || isSplitScreenVisible()) ? out : null;

        } else {

            if (isOpening && getStageOfTask(triggerTask) != null) {

                // One task is appearing into split, prepare to enter split screen.
@@ -2385,9 +2390,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),

                        TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);

            }

        }

            return out;

        }

    }



    /**

     * This is used for mixed scenarios. For such scenarios, just make sure to include exiting