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

Commit 2333f56c authored by Chris Li's avatar Chris Li
Browse files

Don't include PiP activity in app transit 

When an activity in ActivityEmbedding split with another being paused,
the PiP activity's visibility may be changed to invisible and visible
again. We don't want to include such case in the app transition
animation.

Bug: 225371112
Test: verify with PiP app with ActivityEmbedding
Change-Id: I2bb781fb362518f5f11c4c8ad65eb5d2f33a5dfd
parent 064b49a1

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

+5 −1
Original line number Diff line number Diff line
@@ -5095,7 +5095,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        final boolean recentsAnimating = isAnimating(PARENTS, ANIMATION_TYPE_RECENTS);

        if (okToAnimate(true /* ignoreFrozen */, canTurnScreenOn())

                && (appTransition.isTransitionSet()

                || (recentsAnimating && !isActivityTypeHome()))) {

                || (recentsAnimating && !isActivityTypeHome()))

                // If the visibility change during enter PIP, we don't want to include it in app

                // transition to affect the animation theme, because the Pip organizer will animate

                // the entering PIP instead.

                && !mWaitForEnteringPinnedMode) {

            if (visible) {

                displayContent.mOpeningApps.add(this);

                mEnteringAnimation = true;