From 315efbb1271015ad4376096efbdcb75cdae3d51a Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@google.com>
Date: Fri, 27 Sep 2024 16:19:34 +0000
Subject: Add timestamp API extension for predictive back

With this change, we're exposing the frameTime with the BackEvent. This is useful for velocity calculations.

Bug: 362938401
Flag: com.android.window.flags.predictive_back_timestamp_api
Test: WindowOnBackInvokedDispatcher
Test: OnBackInvokedCallbackGestureTest
Change-Id: I42b042e5c816a93d472d1a7d1e9949ab144e73f7
---
 .../src/com/android/wm/shell/back/BackAnimationController.java     | 7 ++-----
 .../src/com/android/wm/shell/back/BackProgressAnimatorTest.java    | 1 +
 .../android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt  | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'libs')

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 b90e6e2fab8a..19b51f143241 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
@@ -355,11 +355,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
                 int keyAction,
                 @BackEvent.SwipeEdge int swipeEdge
         ) {
-            mShellExecutor.execute(() -> onMotionEvent(
-                    /* touchX = */ touchX,
-                    /* touchY = */ touchY,
-                    /* keyAction = */ keyAction,
-                    /* swipeEdge = */ swipeEdge));
+            mShellExecutor.execute(
+                    () -> onMotionEvent(touchX, touchY, keyAction, swipeEdge));
         }
 
         @Override
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java
index 1da4ef6b5a8b..266e48482568 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackProgressAnimatorTest.java
@@ -53,6 +53,7 @@ public class BackProgressAnimatorTest {
         return new BackMotionEvent(
                 /* touchX = */ touchX,
                 /* touchY = */ 0,
+                /* frameTime = */ 0,
                 /* progress = */ progress,
                 /* triggerBack = */ false,
                 /* swipeEdge = */ BackEvent.EDGE_LEFT,
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt
index 2235c20d7f21..2cc52c5ab9ad 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt
@@ -221,6 +221,7 @@ class CustomCrossActivityBackAnimationTest : ShellTestCase() {
         BackMotionEvent(
             /* touchX = */ touchX,
             /* touchY = */ 0f,
+            /* frameTime = */ 0,
             /* progress = */ progress,
             /* triggerBack = */ false,
             /* swipeEdge = */ BackEvent.EDGE_LEFT,
-- 
cgit v1.2.3-59-g8ed1b