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

Commit 4c4859a8 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 sc-dev am: 04350c57 

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

Change-Id: I8dee5ab25c4f67d0d408bb17b6a50aafc62a47d4
parents 1c82804d 04350c57

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