Merge pull request #60442 from madmiraal/remove-superfluous-inputmana…

…ger-3.x

misc/scripts/clang_format.sh

@@ -31,8 +31,6 @@ while IFS= read -rd '' f; do
                 continue 2
             elif [[ "$f" == *"theme_data.h" ]]; then
                 continue 2
-            elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/input/InputManager"* ]]; then
-                continue 2
             elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView"* ]]; then
                 continue 2
             elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper"* ]]; then

platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java

@@ -34,8 +34,9 @@
 
 import org.godotengine.godot.GodotLib;
 import org.godotengine.godot.GodotView;
-import org.godotengine.godot.input.InputManagerCompat.InputDeviceListener;
 
+import android.content.Context;
+import android.hardware.input.InputManager;
 import android.os.Build;
 import android.util.Log;
 import android.util.SparseArray;
@@ -53,18 +54,18 @@
 /**
  * Handles input related events for the {@link GodotView} view.
  */
-public class GodotInputHandler implements InputDeviceListener {
+public class GodotInputHandler implements InputManager.InputDeviceListener {
 	private final String tag = this.getClass().getSimpleName();
 
 	private final SparseIntArray mJoystickIds = new SparseIntArray(4);
 	private final SparseArray<Joystick> mJoysticksDevices = new SparseArray<>(4);
 
 	private final GodotView godotView;
-	private final InputManagerCompat inputManager;
+	private final InputManager inputManager;
 
 	public GodotInputHandler(GodotView godotView) {
 		this.godotView = godotView;
-		this.inputManager = InputManagerCompat.Factory.getInputManager(godotView.getContext());
+		this.inputManager = (InputManager)godotView.getContext().getSystemService(Context.INPUT_SERVICE);
 		this.inputManager.registerInputDeviceListener(this, null);
 	}