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

Commit 55561fbc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Compare containers in mChangingContainers with Task for change... 

Merge "Compare containers in mChangingContainers with Task for change transitions" into rvc-dev am: f2d6baac

Change-Id: I1b188623dd220613fdb8810cf5206780515e0dab
parents d9f58010 f2d6baac

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

+3 −1
Original line number Diff line number Diff line
@@ -387,9 +387,11 @@ class RemoteAnimationController implements DeathRecipient { 
        int getMode() {

            final DisplayContent dc = mWindowContainer.getDisplayContent();

            final ActivityRecord topActivity = mWindowContainer.getTopMostActivity();

            // Note that opening/closing transitions are per-activity while changing transitions

            // are per-task.

            if (dc.mOpeningApps.contains(topActivity)) {

                return RemoteAnimationTarget.MODE_OPENING;

            } else if (dc.mChangingContainers.contains(topActivity)) {

            } else if (dc.mChangingContainers.contains(mWindowContainer)) {

                return RemoteAnimationTarget.MODE_CHANGING;

            } else {

                return RemoteAnimationTarget.MODE_CLOSING;