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

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

Merge "Fix visibility change during entering PIP app transition" into tm-dev am: 7284a6a9 

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



Change-Id: Idbebefc013cc5a6fbee0145ddbb3dda513f7d967
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 336c0135 7284a6a9

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

+6 −4
Original line number Diff line number Diff line
@@ -5095,13 +5095,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // still check DC#okToAnimate again if the transition animation is fine to apply.

        // TODO(new-app-transition): Rewrite this logic using WM Shell.

        final boolean recentsAnimating = isAnimating(PARENTS, ANIMATION_TYPE_RECENTS);

        final boolean isEnteringPipWithoutVisibleChange = mWaitForEnteringPinnedMode

                && mVisible == visible;

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

                && (appTransition.isTransitionSet()

                || (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 the visibility is not changed 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.

                && !isEnteringPipWithoutVisibleChange) {

            if (visible) {

                displayContent.mOpeningApps.add(this);

                mEnteringAnimation = true;