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

Commit eec6b98e authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "No onMultiWindowModeChanged callback from split to PiP" into rvc-dev...

Merge "No onMultiWindowModeChanged callback from split to PiP" into rvc-dev am: 97c4cda8 am: 883c5320 am: 807ffff5

Change-Id: I7aefab3ca0270d6aa8171ee5121c2885473177ad
parents bca03797 807ffff5
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -2187,6 +2187,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
                // up-to-dated pinned stack information on this newly created stack.
                r.reparent(stack, MAX_VALUE, reason);
            }
            // The intermediate windowing mode to be set on the ActivityRecord later.
            // This needs to happen before the re-parenting, otherwise we will always set the
            // ActivityRecord to be fullscreen.
            final int intermediateWindowingMode = stack.getWindowingMode();
            if (stack.getParent() != taskDisplayArea) {
                // stack is nested, but pinned tasks need to be direct children of their
                // display area, so reparent.
@@ -2195,7 +2199,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
            // Defer the windowing mode change until after the transition to prevent the activity
            // from doing work and changing the activity visuals while animating
            // TODO(task-org): Figure-out more structured way to do this long term.
            r.setWindowingMode(stack.getWindowingMode());
            r.setWindowingMode(intermediateWindowingMode);
            stack.setWindowingMode(WINDOWING_MODE_PINNED);

            // Reset the state that indicates it can enter PiP while pausing after we've moved it