From d4809c6ccbbd50edcf5fccff65c30f2492061f75 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Tue, 6 Jun 2023 10:27:45 +0000 Subject: [PATCH] Fix Pair-to-Pair animation being canceled in recents transition handler. The recents animation should be canceled when leaft task changed(e.g. expand Pip), so there should ignore structural change from non-leaf tasks. Bug: 286024881 Test: Put app in Pip, open another app, go to recents, expand pip Test: Verify animation won't break when playing Pair-to-Pair switch. Test: Do above tests with 3p Launcher. Change-Id: I5d0f2c5750d0cad3887ed95f268cb42bd5961fdb --- .../android/wm/shell/recents/RecentsTransitionHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index 8723f9b0181d1..66da1253be6f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -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; } }