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

Commit 1d4d4431 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix decor stuck after rotate" into udc-dev am: 8b77e6b0 am: b05472cc 

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



Change-Id: I04cb2d7ca27804dc078591ccf49359f99247596f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7122d909 b05472cc

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

+15 −10
Original line number Diff line number Diff line
@@ -2035,18 +2035,16 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        // Reset this flag every time onLayoutSizeChanged.

        mShowDecorImmediately = false;



        if (!ENABLE_SHELL_TRANSITIONS) {

            // Only need screenshot for legacy case because shell transition should screenshot

            // itself during transition.

            final SurfaceControl.Transaction startT = mTransactionPool.acquire();

            mMainStage.screenshotIfNeeded(startT);

            mSideStage.screenshotIfNeeded(startT);

            mTransactionPool.release(startT);

        }



        final WindowContainerTransaction wct = new WindowContainerTransaction();

        boolean sizeChanged = updateWindowBounds(layout, wct);

        if (!sizeChanged) return;

        if (!sizeChanged) {

            // We still need to resize on decor for ensure all current status clear.

            final SurfaceControl.Transaction t = mTransactionPool.acquire();

            mMainStage.onResized(t);

            mSideStage.onResized(t);

            mTransactionPool.release(t);

            return;

        }



        sendOnBoundsChanged();

        if (ENABLE_SHELL_TRANSITIONS) {
@@ -2054,6 +2052,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mSplitTransitions.startResizeTransition(wct, this, (finishWct, t) ->

                    mSplitLayout.setDividerInteractive(true, false, "onSplitResizeFinish"));

        } else {

            // Only need screenshot for legacy case because shell transition should screenshot

            // itself during transition.

            final SurfaceControl.Transaction startT = mTransactionPool.acquire();

            mMainStage.screenshotIfNeeded(startT);

            mSideStage.screenshotIfNeeded(startT);

            mTransactionPool.release(startT);



            mSyncQueue.queue(wct);

            mSyncQueue.runInSync(t -> {

                updateSurfaceBounds(layout, t, false /* applyResizingOffset */);