diff options
| author | Fredia Huya-Kouadio <fhuya@meta.com> | 2024-01-17 13:44:11 -0800 |
|---|---|---|
| committer | Fredia Huya-Kouadio <fhuya@meta.com> | 2024-01-18 10:35:32 -0800 |
| commit | e04a38775b45d25155d7658d3914d4eef2b9fd42 (patch) | |
| tree | c697060b6d8031bbbfb99f8827a336772301dcaf /platform/android/java/lib/src/org/godotengine/godot | |
| parent | 2ababdcc065e76decc12747a3c84e01f7bdc90dd (diff) | |
| download | redot-engine-e04a38775b45d25155d7658d3914d4eef2b9fd42.tar.gz | |
Update Android dependencies for the project
- Update Android gradle plugin version from 7.2.1 to 8.2.0
- Update gradle version from 7.4.2 to 8.2
- Update target SDK from 33 to 34
- Update build tools version from 33.0.2 to 34.0.0
- Update kotlin version from 1.7.0 to 1.9.20
- Update Android fragment version from 1.3.6 to 1.6.2
- Update AndroidX window version from 1.0.0 to 1.2.0
Diffstat (limited to 'platform/android/java/lib/src/org/godotengine/godot')
| -rw-r--r-- | platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt index e26c9d39c2..89fbb9f580 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt @@ -210,21 +210,23 @@ internal class GodotGestureHandler : SimpleOnGestureListener(), OnScaleGestureLi } override fun onScroll( - originEvent: MotionEvent, + originEvent: MotionEvent?, terminusEvent: MotionEvent, distanceX: Float, distanceY: Float ): Boolean { if (scaleInProgress) { if (dragInProgress) { - // Cancel the drag - GodotInputHandler.handleMotionEvent( - originEvent.source, - MotionEvent.ACTION_CANCEL, - originEvent.buttonState, - originEvent.x, - originEvent.y - ) + if (originEvent != null) { + // Cancel the drag + GodotInputHandler.handleMotionEvent( + originEvent.source, + MotionEvent.ACTION_CANCEL, + originEvent.buttonState, + originEvent.x, + originEvent.y + ) + } dragInProgress = false } } |