Merge "Fix Pair-to-Pair animation being canceled in recents transition handler." into udc-dev am: 0d295f9da0 am: c0b6fd946c

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

Change-Id: I72120b421c684550bd80adcd36f1664a79d893f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2023-06-08 08:09:05 +00:00
committed by Automerger Merge Worker

View File

@@ -595,8 +595,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
cancel(mWillFinishToHome, true /* withScreenshots */, "display change");
return;
}
// Don't consider order-only changes as changing apps.
if (!TransitionUtil.isOrderOnly(change)) {
// Don't consider order-only & non-leaf changes as changing apps.
if (!TransitionUtil.isOrderOnly(change) && isLeafTask) {
hasChangingApp = true;
}
}