commit 81f7d0bbf58826127c3fbc2d36f5c54623526781
author Shan Huang <shanh@google.com> Thu Dec 29 03:15:03 2022 +0000
committer Shan Huang <shanh@google.com> Thu Dec 29 21:20:40 2022 +0000
tree 2e731fab14fb481cd0f06fba9084994d5a181557
parent 5dd5296527dd93139668c23401f01ebbc7f711d4

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

quickstep/src/com/android/quickstep/LauncherBackAnimationController.java

diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
index 2741751..3edbbdf 100644
--- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
+++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
@@ -36,6 +36,7 @@
 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 @@
             }
 
             @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 @@
         mBackCallback = null;
     }
 
-    private void startBack(BackEvent backEvent) {
+    private void startBack(BackMotionEvent backEvent) {
         mBackInProgress = true;
         RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget();