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

Commit abfd3672 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Don't include PiP activity in app transit" into tm-dev am: 20fc9f18 

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



Change-Id: Id6a3613624d821f044204188a7ac01b817b6dee8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1490029a 20fc9f18

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

+5 −1
Original line number Diff line number Diff line
@@ -5096,7 +5096,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;