Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c69e6e authored by wilsonshih's avatar wilsonshih
Browse files

Correct cross-task animation target for shell transition. 

We use activity as animation target for cross-task animation because
the transition target must be activity in legacy transition.

Bug: 259429314
Test: verify cross-task animation should happen on Task layer.
Change-Id: I6235ec66f7fca1c8c74cc8b9433166e1bed64474
parent 2ef3c463

services/core/java/com/android/server/wm/BackNavigationController.java

+3 −1
Original line number Diff line number Diff line
@@ -778,7 +778,9 @@ class BackNavigationController { 
                closeTarget = close.asActivityRecord();

            } else if (isTaskSwitch(close, open)) {

                mSwitchType = TASK_SWITCH;

                closeTarget = close.asTask().getTopNonFinishingActivity();

                // The transition target must be activity in legacy transition.

                closeTarget = WindowManagerService.sEnableShellTransitions ? close

                        : close.asTask().getTopNonFinishingActivity();

            } else {

                mSwitchType = UNKNOWN;

                return;