summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fengjiang Li <fengjial@google.com> 2024-02-05 14:03:56 -0800
committer Fengjiang Li <fengjial@google.com> 2024-02-05 14:03:56 -0800
commita079a274f2395ef7a89ca18c08608aaf7250968f (patch)
tree6f5c85777d23762ec680bf33748d584113bdabc6
parent33334554da31cd2c24eea92f2ba612ab9cd82829 (diff)
Make sure OnBackAnimationCallback#onBackStarted is called before OnBackAnimationCallback#onBackProgressed
Fix: 317285367 Test: manual Flag: NONE Change-Id: I608075f64e9468556be983d9f9e30854e72a68ea
-rw-r--r--core/java/android/window/WindowOnBackInvokedDispatcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java
index 65075aea7b27..89ad2f7f57ed 100644
--- a/core/java/android/window/WindowOnBackInvokedDispatcher.java
+++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java
@@ -359,11 +359,11 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {
}
final OnBackAnimationCallback callback = getBackAnimationCallback();
if (callback != null) {
- mProgressAnimator.onBackStarted(backEvent, event ->
- callback.onBackProgressed(event));
callback.onBackStarted(new BackEvent(
backEvent.getTouchX(), backEvent.getTouchY(),
backEvent.getProgress(), backEvent.getSwipeEdge()));
+ mProgressAnimator.onBackStarted(backEvent, event ->
+ callback.onBackProgressed(event));
}
});
}