From d365fa39d251c6b57224391b4320f758a28d6259 Mon Sep 17 00:00:00 2001 From: ijonghyeon Date: Sat, 28 Oct 2023 15:29:22 +0900 Subject: [PATCH] Makes PlatformViewsController view to use tracked event's action & pointer count --- .../io/flutter/plugin/platform/PlatformViewsController.java | 4 ++-- .../flutter/plugin/platform/PlatformViewsControllerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java index 820a8629b4350..1f3595ef9065d 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java @@ -688,8 +688,8 @@ public MotionEvent toMotionEvent( return MotionEvent.obtain( trackedEvent.getDownTime(), trackedEvent.getEventTime(), - touch.action, - touch.pointerCount, + trackedEvent.getAction(), + trackedEvent.getPointerCount(), pointerProperties, pointerCoords, trackedEvent.getMetaState(), diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java index 3bb1dc7ba7ce0..2a9ed677302dc 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java @@ -356,8 +356,8 @@ public void itUsesActionEventTypeFromFrameworkEventAsActionChanged() { frameWorkTouch, false // usingVirtualDisplays ); - assertEquals(resolvedEvent.getAction(), frameWorkTouch.action); - assertNotEquals(resolvedEvent.getAction(), original.getAction()); + assertEquals(resolvedEvent.getAction(), original.getAction()); + assertNotEquals(resolvedEvent.getAction(), frameWorkTouch.action); } @Ignore