Add support for SDL-compatible joypad GUID on Android #114338
+246
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Nintorch
changed the title
This was referenced Dec 26, 2025
Nintorch
commented
Dec 26, 2025
platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
Outdated
Show resolved
Hide resolved
Nintorch
force-pushed
the
android-sdl-guid
branch
from
de7dcb7 to
07288ea
Compare
m4gr3d
reviewed
Dec 26, 2025
platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
Outdated
Show resolved
Hide resolved
m4gr3d
reviewed
Dec 26, 2025
platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
Outdated
Show resolved
Hide resolved
m4gr3d
reviewed
Dec 26, 2025
platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
Outdated
Show resolved
Hide resolved
m4gr3d
reviewed
Dec 26, 2025
platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
Outdated
Show resolved
Hide resolved
m4gr3d
reviewed
Dec 26, 2025
platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
Outdated
Show resolved
Hide resolved
m4gr3d
reviewed
Dec 26, 2025
Contributor
m4gr3d
left a comment
m4gr3d
left a comment
There was a problem hiding this comment.
Alongside manual testing, can you add unit tests to validate the added logic.
Contributor
Author
|
Thank you for your review, m4gr3d! I will be able to fix the code later today! |
Nintorch
force-pushed
the
android-sdl-guid
branch
from
07288ea to
d7bbdc3
Compare
Nintorch
force-pushed
the
android-sdl-guid
branch
3 times, most recently
from
bc31ec9 to
60d7a23
Compare
Nintorch
force-pushed
the
android-sdl-guid
branch
from
60d7a23 to
c258401
Compare
m4gr3d
reviewed
Dec 26, 2025
| mJoysticksDevices.put(deviceId, joystick); | ||
|
|
||
| handleJoystickConnectionChangedEvent(id, true, joystick.name); | ||
| if (Build.VERSION.SDK_INT >= 19) { // device.getVendorId() and device.getProductId() are only present in API 19 and above. |
Contributor
There was a problem hiding this comment.
Suggested change
| if (Build.VERSION.SDK_INT >= 19) { // device.getVendorId() and device.getProductId() are only present in API 19 and above. | |
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { // InputDevice#getVendorId() and InputDevice#getProductId() are only present in API 19 and above. |
m4gr3d
reviewed
Dec 26, 2025
| mJoystickIds.delete(deviceId); | ||
| mJoysticksDevices.delete(deviceId); | ||
| handleJoystickConnectionChangedEvent(godotJoyId, false, ""); | ||
| handleJoystickConnectionChangedEvent(godotJoyId, false, "", 0, 0, 0, 0); |
Contributor
There was a problem hiding this comment.
In the update above the button_mask and axis_mask were defaulted to -1; is there a difference with using 0 here?
Contributor
Author
There was a problem hiding this comment.
They aren't used when a device gets disconnected
m4gr3d
reviewed
Dec 26, 2025
| //Helps with creating new joypad mappings. | ||
| Log.i(TAG, "=== New Input Device: " + joystick.name); | ||
|
|
||
| ArrayList<InputDevice.MotionRange> axes_motion_ranges = new ArrayList<>(); |
Contributor
There was a problem hiding this comment.
Suggested change
| ArrayList<InputDevice.MotionRange> axes_motion_ranges = new ArrayList<>(); | |
| ArrayList<InputDevice.MotionRange> axesMotionRanges = new ArrayList<>(); |
Contributor
There was a problem hiding this comment.
Here and in the updates below, parameters and variables names should use the camelCase style. snake_case is only used in the C++ codebase.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hopefully fixes #56181 (if not, then we need to create a mapping for Xbox controllers ourselves)
This PR adds support for SDL-compatible joypad GUIDs on Android, so now we should be able to use SDL controller mapping database for Android controllers.
This PR adds support for
Input.get_joy_info()for Android as well.See also SDL's
Android_AddJoystick, SDL'sSDLControllerManager, and the way GUID was constructed in Godot's Linux joypad driver prior to the SDL3 joystick driver PR here.DualShock 4 GUID before this PR
(Ignore that there's no fingerprint sensor here, it's a screenshot with a different PR applied)
DualShock 4 GUID after this PR + Input.get_joy_info()