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

Commit 0eee437c authored by Sam Dubey's avatar Sam Dubey Committed by Automerger Merge Worker
Browse files

Merge "Revert "Do not enter pip during transient launch."" into udc-qpr-dev am: bfa03860 

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



Change-Id: Ica18deed5f14f5cf2fb1b24d33dc8174e5df5b0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cb73026 bfa03860

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

+9 −10
Original line number Diff line number Diff line
@@ -5251,18 +5251,17 @@ class Task extends TaskFragment { 
            // Ensure that we do not trigger entering PiP an activity on the root pinned task.

            return;

        }

        final boolean isTransient = opts != null && opts.getTransientLaunch();

        final Task targetRootTask = toFrontTask != null

                ? toFrontTask.getRootTask() : toFrontActivity.getRootTask();

        final boolean isTransient = opts != null && opts.getTransientLaunch()

                || (targetRootTask != null

                && targetRootTask.mTransitionController.isTransientHide(targetRootTask));



        // Ensure the task/activity being brought forward is not the assistant and is not transient

        // nor transient hide target. In the case of transient-launch, we want to wait until the end

        // of the transition and only allow to enter pip on task switch after the transient launch

        // was committed.

        pipCandidate.supportsEnterPipOnTaskSwitch = targetRootTask == null

                || !(targetRootTask.isActivityTypeAssistant() || isTransient);

        if (targetRootTask != null && (targetRootTask.isActivityTypeAssistant() || isTransient)) {

            // Ensure the task/activity being brought forward is not the assistant and is not

            // transient. In the case of transient-launch, we want to wait until the end of the

            // transition and only allow switch if the transient launch was committed.

            return;

        }

        pipCandidate.supportsEnterPipOnTaskSwitch = true;



    }



    /**

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

+0 −4
Original line number Diff line number Diff line
@@ -1041,10 +1041,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            ar.getTaskFragment().startPausing(false /* uiSleeping */,

                    null /* resuming */, "finishTransition");

        } finally {

            // Didn't schedule for pip, clear the supportsEnterPipOnTaskSwitch flag.

            if (!ar.mPauseSchedulePendingForPip) {

                ar.supportsEnterPipOnTaskSwitch = false;

            }

            mController.mAtm.mTaskSupervisor.mUserLeaving = false;

        }

        // Return false anyway because there's no guarantee that the app will enter pip.