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

Commit b5054e35 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 am: 0b513160 

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



Change-Id: If828eca318d809653fa0e2fb23fec4b844167a03
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82b85eaa 0b513160

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;