Merge "Fix Pair-to-Pair animation being canceled in recents transition handler." into udc-dev

This commit is contained in:
Wei Sheng Shih
2023-06-08 07:08:38 +00:00
committed by Android (Google) Code Review

View File

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