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

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

Merge "Pass NO_USER_ACTION activity option along to shell transition" into... 

Merge "Pass NO_USER_ACTION activity option along to shell transition" into tm-qpr-dev am: 5f49a6b8

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



Change-Id: I48965ac8fd93401e3f793616aded9cacd7a6928d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c40e00b 5f49a6b8

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

+4 −0
Original line number Diff line number Diff line
@@ -1747,6 +1747,10 @@ class ActivityStarter { 
            // until after we launched to identify the relevant activity.

            transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask);

        }

        if (!mSupervisor.mUserLeaving) {

            // no-user-leaving implies not entering PiP.

            transitionController.setCanPipOnFinish(false /* canPipOnFinish */);

        }

        if (newTransition != null) {

            transitionController.requestStartTransition(newTransition,

                    mTargetTask == null ? started.getTask() : mTargetTask,

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

+6 −0
Original line number Diff line number Diff line
@@ -544,6 +544,12 @@ class TransitionController { 
        }

    }



    /** @see Transition#setCanPipOnFinish */

    void setCanPipOnFinish(boolean canPipOnFinish) {

        if (mCollectingTransition == null) return;

        mCollectingTransition.setCanPipOnFinish(canPipOnFinish);

    }



    void legacyDetachNavigationBarFromApp(@NonNull IBinder token) {

        final Transition transition = Transition.fromBinder(token);

        if (transition == null || !mPlayingTransitions.contains(transition)) {