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

Commit 12fcb01e authored by Jerry Chang's avatar Jerry Chang Committed by android-build-team Robot
Browse files

Make sure to reorder side stage above main stage to prevent flicker 

Always reorder side stage to the top whenever there's a child task
appeared in side stage. This is needed to prevent main stage occludes
newly launched task in side stage and causing itself flipping between
fullscreen and multi-window windowing mode.

Fix: 186614428
Bug: 169271875
Test: enter staged split by launching task with adjacent flag, screen
won't flicker

Change-Id: I9176a97439d687bbc7b0bf2dd9ddfdaecacfa455
(cherry picked from commit 57b13e32)
parent 35a27ced

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

+4 −0
Original line number Diff line number Diff line
@@ -452,6 +452,10 @@ class StageCoordinator implements SplitLayout.LayoutChangeListener, 
            // Make sure the main stage is active.

            mMainStage.activate(getMainStageBounds(), wct);

            mSideStage.setBounds(getSideStageBounds(), wct);

            // Reorder side stage to the top whenever there's a new child task appeared in side

            // stage. This is needed to prevent main stage occludes side stage and makes main stage

            // flipping between fullscreen and multi-window windowing mode.

            wct.reorder(mSideStage.mRootTaskInfo.token, true);

            mTaskOrganizer.applyTransaction(wct);

        }

    }