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

Commit cc054b94 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Also check PiP activity visibility to determine if enter-pip" into udc-dev

parents 65be4cf1 34cf703b

services/core/java/com/android/server/wm/Transition.java

+3 −2
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        }



        if (ar.pictureInPictureArgs != null && ar.pictureInPictureArgs.isAutoEnterEnabled()) {

            if (didCommitTransientLaunch()) {

            if (!ar.getTask().isVisibleRequested() || didCommitTransientLaunch()) {

                // force enable pip-on-task-switch now that we've committed to actually launching

                // to the transient activity.

                ar.supportsEnterPipOnTaskSwitch = true;
@@ -1008,7 +1008,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        }



        // Legacy pip-entry (not via isAutoEnterEnabled).

        if (didCommitTransientLaunch() && ar.supportsPictureInPicture()) {

        if ((!ar.getTask().isVisibleRequested() || didCommitTransientLaunch())

                && ar.supportsPictureInPicture()) {

            // force enable pip-on-task-switch now that we've committed to actually launching to the

            // transient activity, and then recalculate whether we can attempt pip.

            ar.supportsEnterPipOnTaskSwitch = true;