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

Commit f2d6baac authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents e39c2e7e 6632259c

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;