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

Commit 3d4b9a86 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix main stage full screen after lock phone" into sc-v2-dev am: a15c1717 

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

Change-Id: If638998965e9e712b4636f975d869e69cbe376b8
parents bef82bc5 a15c1717

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

+2 −1
Original line number Diff line number Diff line
@@ -526,9 +526,10 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                // visible.

                mMainStage.updateConfiguration(

                        WINDOWING_MODE_MULTI_WINDOW, getMainStageBounds(), wct);

            } else {

            } else if (!mSideStage.mRootTaskInfo.isSleeping) {

                // We want the main stage configuration to be fullscreen when the side stage isn't

                // visible.

                // We should not do it when side stage are not visible due to sleeping display too.

                mMainStage.updateConfiguration(WINDOWING_MODE_FULLSCREEN, null, wct);

            }

            // TODO: Change to `mSyncQueue.queue(wct)` once BLAST is stable.