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

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

Browse Source 
Change-Id: I1b188623dd220613fdb8810cf5206780515e0dab
This commit is contained in:
TreeHugger Robot
2020-05-20 01:36:04 +00:00
committed by Automerger Merge Worker
parent d9f58010b6 f2d6baac91
commit 55561fbc8f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/RemoteAnimationController.java
View File

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