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

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

Merge "Don't promote the animation on Task's parent when clearing task" into... 

Merge "Don't promote the animation on Task's parent when clearing task" into sc-dev am: 04350c57 am: cb0ed095

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

Change-Id: I285662c198093ad67513e6bb75c970f5c8cb9dbe
parents 18b48f45 cb0ed095

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

+5 −1
Original line number Diff line number Diff line
@@ -623,7 +623,11 @@ public class AppTransitionController { 
            siblings.add(current);

            boolean canPromote = true;



            if (parent == null || !parent.canCreateRemoteAnimationTarget()) {

            if (parent == null || !parent.canCreateRemoteAnimationTarget()

                    // We cannot promote the animation on Task's parent when the task is in

                    // clearing task in case the animating get stuck when performing the opening

                    // task that behind it.

                    || (current.asTask() != null && current.asTask().mInRemoveTask)) {

                canPromote = false;

            } else {

                // In case a descendant of the parent belongs to the other group, we cannot promote