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

Commit 5bd9c56d authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

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

Merge "Also check PiP activity visibility to determine if enter-pip" into udc-dev am: cc054b94 am: 2da54539

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



Change-Id: I111b857c570412808cc635c4ff5f73647d512167
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd9fd9dd 2da54539

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;