Merge "Detect 3p launcher move-to-front during recents." into udc-dev am: 76fad89c1f am: 5c55b19828

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

Change-Id: I56dc3cb14956235657c05711ecd6c1fb7a2c5c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2023-06-08 18:22:27 +00:00
committed by Automerger Merge Worker

View File

@@ -598,6 +598,17 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
// Don't consider order-only & non-leaf changes as changing apps.
if (!TransitionUtil.isOrderOnly(change) && isLeafTask) {
hasChangingApp = true;
} else if (isLeafTask && taskInfo.topActivityType == ACTIVITY_TYPE_HOME
&& !mRecentsTask.equals(change.getContainer())) {
// Unless it is a 3p launcher. This means that the 3p launcher was already
// visible (eg. the "pausing" task is translucent over the 3p launcher).
// Treat it as if we are "re-opening" the 3p launcher.
if (openingTasks == null) {
openingTasks = new ArrayList<>();
openingTaskIsLeafs = new IntArray();
}
openingTasks.add(change);
openingTaskIsLeafs.add(1);
}
}
}