diff options
| author | 2024-10-14 12:54:50 +0000 | |
|---|---|---|
| committer | 2024-10-14 12:54:50 +0000 | |
| commit | 0c331e2cea98645c224be237ba804c6a67cee500 (patch) | |
| tree | bfd52197249e2903a1aee2d8438d658755e36952 /libs | |
| parent | 882509d8e5bf4db0c4b6078e075ad66129c0fcd6 (diff) | |
| parent | 315efbb1271015ad4376096efbdcb75cdae3d51a (diff) | |
Merge "Add timestamp API extension for predictive back" into main
Diffstat (limited to 'libs')
3 files changed, 4 insertions, 5 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 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, |