From 81f7d0bbf58826127c3fbc2d36f5c54623526781 Mon Sep 17 00:00:00 2001 From: Shan Huang Date: Thu, 29 Dec 2022 03:15:03 +0000 Subject: [PATCH] DO NOT MERGE Rename BackEvent to BackMotionEvent in LauncherBackAnimationController. This cherry-picks ag/20484685 to QPR to mitigate future merge conflicts. Bug: 238475284 Test: m -j Change-Id: Ie13c738d0d4a10f4265fbf116ff7b4206d3bfc62 --- .../android/quickstep/LauncherBackAnimationController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java index 27417516a4..3edbbdf983 100644 --- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java +++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java @@ -36,6 +36,7 @@ import android.view.SurfaceControl; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.window.BackEvent; +import android.window.BackMotionEvent; import android.window.BackProgressAnimator; import android.window.IOnBackInvokedCallback; @@ -134,14 +135,14 @@ public class LauncherBackAnimationController { } @Override - public void onBackProgressed(BackEvent backEvent) { + public void onBackProgressed(BackMotionEvent backEvent) { handler.post(() -> { mProgressAnimator.onBackProgressed(backEvent); }); } @Override - public void onBackStarted(BackEvent backEvent) { + public void onBackStarted(BackMotionEvent backEvent) { handler.post(() -> { startBack(backEvent); mProgressAnimator.onBackStarted(backEvent, event -> { @@ -185,7 +186,7 @@ public class LauncherBackAnimationController { mBackCallback = null; } - private void startBack(BackEvent backEvent) { + private void startBack(BackMotionEvent backEvent) { mBackInProgress = true; RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget();