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

Commit 0905b464 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: 6ce8af2f

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



Change-Id: Ib168c8a3a74e997bbb6db77e747f67e96eca0d49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e55f68e3 6ce8af2f

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

+3 −2
Original line number Diff line number Diff line
@@ -987,7 +987,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;
@@ -1016,7 +1016,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;