diff options
| author | 2025-03-23 21:51:51 -0700 | |
|---|---|---|
| committer | 2025-03-23 21:51:51 -0700 | |
| commit | 98a01f4389f2dba2cf501eeac5ee668a98265a26 (patch) | |
| tree | be6e68c62f769c7facad0e6046d38f5c5721f93a /libs | |
| parent | 225565e91d552a034d99595950d3228753bc18e1 (diff) | |
| parent | e0a9fcc642b37c08decfd6cd468fe48643cc0c82 (diff) | |
Merge "Revert^2 "Remove DepartingAnimationTarget from BackMotionEvent"" into main
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index 746632f67725..f91154c7a362 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -1050,7 +1050,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont () -> mShellExecutor.execute(this::onBackAnimationFinished)); if (mApps.length >= 1) { - BackMotionEvent startEvent = mCurrentTracker.createStartEvent(mApps[0]); + BackMotionEvent startEvent = mCurrentTracker.createStartEvent( + Flags.removeDepartTargetFromMotion() ? null : mApps[0]); dispatchOnBackStarted(mActiveCallback, startEvent); if (startEvent.getSwipeEdge() == EDGE_NONE) { // TODO(b/373544911): onBackStarted is dispatched here so that |