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

Commit aa93eaab 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 am: 55561fbc

Change-Id: I6c4d72ffe94190edda1995aacc144d58d94037cf
parents d580b735 55561fbc

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;