Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I13d349233ed7dae8077ea36053995132890c0e61
This commit is contained in:
TreeHugger Robot
2021-06-16 13:43:56 +00:00
committed by Automerger Merge Worker
parent 14ccf3168e 04350c57de
commit 7117302dca
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/AppTransitionController.java
View File

@@ -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