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

Commit 0d7b35a2 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Make sure to reorder side stage above main stage to prevent flicker"... 

Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev am: 5663de78

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

Change-Id: If2db0a33ae25332ae958e10a9c7e8511eb311c3b
parents 0d1bf034 5663de78

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

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

            // Make sure the main stage is active.

            mMainStage.activate(getMainStageBounds(), wct);

            mMainStage.activate(getMainStageBounds(), wct);

            mSideStage.setBounds(getSideStageBounds(), 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);

            mTaskOrganizer.applyTransaction(wct);

        }

        }

    }

    }