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

Commit 32e6a383 authored by Winson Chung's avatar Winson Chung
Browse files

Only handle transition requests in split if active and visible 

- Otherwise handling all requests prevents dynamic remote animations from being registered and run

Fixes: 285995223
Test: Presubmit
Change-Id: Ic5d3d197a1d9623d1eb5612dcfb4fecd83666145
parent 4c77d932

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

+6 −1
Original line number Diff line number Diff line
@@ -2342,6 +2342,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.
@@ -2351,9 +2356,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