firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #128925 by properly setting the Android Event Source (#138241)

Browse Source 
Touch events were being ignored by Google Maps because we were always setting
the event source to UNKNOWN. This PR maps our PointerDeviceKind to
Android's InputDevice.SOURCE_* enums.

Manually tested with Google Maps.

https://github.com/flutter/flutter/issues/128925
This commit is contained in:
John McCutchan 2023-11-10 12:02:54 -08:00 committed by GitHub
parent 2a979ec60d
commit af246a51b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/flutter/lib/src/services/platform_views.dart
View File

@ -653,12 +653,31 @@ class _AndroidMotionEventConverter {
yPrecision: 1.0, yPrecision: 1.0,
deviceId: 0, deviceId: 0,
edgeFlags: 0, edgeFlags: 0,
source: 0, source: _AndroidMotionEventConverter.sourceFor(event),
flags: 0, flags: 0,
motionEventId: event.embedderId, motionEventId: event.embedderId,
); );
} }
static int sourceFor(PointerEvent event) {
int source = AndroidViewController.kInputDeviceSourceUnknown;
switch (event.kind) {
case PointerDeviceKind.touch:
source = AndroidViewController.kInputDeviceSourceTouchScreen;
case PointerDeviceKind.trackpad:
source = AndroidViewController.kInputDeviceSourceTouchPad;
case PointerDeviceKind.mouse:
source = AndroidViewController.kInputDeviceSourceMouse;
case PointerDeviceKind.stylus:
case PointerDeviceKind.invertedStylus:
source = AndroidViewController.kInputDeviceSourceStylus;
case PointerDeviceKind.unknown:
source = AndroidViewController.kInputDeviceSourceUnknown;
}
return source;
}
AndroidPointerProperties propertiesFor(PointerEvent event, int pointerId) { AndroidPointerProperties propertiesFor(PointerEvent event, int pointerId) {
int toolType = AndroidPointerProperties.kToolTypeUnknown; int toolType = AndroidPointerProperties.kToolTypeUnknown;
switch (event.kind) { switch (event.kind) {
@ -739,6 +758,21 @@ abstract class AndroidViewController extends PlatformViewController {
/// Android's [View.LAYOUT_DIRECTION_RTL](https://developer.android.com/reference/android/view/View.html#LAYOUT_DIRECTION_RTL) value. /// Android's [View.LAYOUT_DIRECTION_RTL](https://developer.android.com/reference/android/view/View.html#LAYOUT_DIRECTION_RTL) value.
static const int kAndroidLayoutDirectionRtl = 1; static const int kAndroidLayoutDirectionRtl = 1;
/// Android's [InputDevice.SOURCE_UNKNOWN](https://developer.android.com/reference/android/view/InputDevice#SOURCE_UNKNOWN)
static const int kInputDeviceSourceUnknown = 0;
/// Android's [InputDevice.SOURCE_TOUCHSCREEN](https://developer.android.com/reference/android/view/InputDevice#SOURCE_TOUCHSCREEN)
static const int kInputDeviceSourceTouchScreen = 4098;
/// Android's [InputDevice.SOURCE_MOUSE](https://developer.android.com/reference/android/view/InputDevice#SOURCE_MOUSE)
static const int kInputDeviceSourceMouse = 8194;
/// Android's [InputDevice.SOURCE_STYLUS](https://developer.android.com/reference/android/view/InputDevice#SOURCE_STYLUS)
static const int kInputDeviceSourceStylus = 16386;
/// Android's [InputDevice.SOURCE_TOUCHPAD](https://developer.android.com/reference/android/view/InputDevice#SOURCE_TOUCHPAD)
static const int kInputDeviceSourceTouchPad = 1048584;
/// The unique identifier of the Android view controlled by this controller. /// The unique identifier of the Android view controlled by this controller.
@override @override
final int viewId; final int viewId;