diff --git a/doc/classes/InputEventMagnifyGesture.xml b/doc/classes/InputEventMagnifyGesture.xml
index 2b6a82e2707..df939234b0d 100644
--- a/doc/classes/InputEventMagnifyGesture.xml
+++ b/doc/classes/InputEventMagnifyGesture.xml
@@ -3,6 +3,7 @@
+ [b]Note:[/b] On Android, this requires the [member ProjectSettings.input_devices/pointing/android/enable_pan_and_scale_gestures] project setting to be enabled.
diff --git a/doc/classes/InputEventPanGesture.xml b/doc/classes/InputEventPanGesture.xml
index 5b65b9207fd..9da9472663c 100644
--- a/doc/classes/InputEventPanGesture.xml
+++ b/doc/classes/InputEventPanGesture.xml
@@ -3,6 +3,7 @@
+ [b]Note:[/b] On Android, this requires the [member ProjectSettings.input_devices/pointing/android/enable_pan_and_scale_gestures] project setting to be enabled.
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index fe7572139c8..debff8dd7e8 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -669,6 +669,12 @@
If [code]false[/code], no input will be lost.
[b]Note:[/b] You should in nearly all cases prefer the [code]false[/code] setting. The legacy behavior is to enable supporting old projects that rely on the old logic, without changes to script.
+
+ If [code]true[/code], long press events on an Android touchscreen are transformed into right click events.
+
+
+ If [code]true[/code], multi-touch pan and scale gestures are enabled on Android devices.
+
If [code]true[/code], sends mouse input events when tapping or swiping on the touchscreen.
diff --git a/main/main.cpp b/main/main.cpp
index b94affd4544..5e6e612d515 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1579,6 +1579,9 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF("input_devices/pointing/emulate_mouse_from_touch", true)));
}
+ GLOBAL_DEF("input_devices/pointing/android/enable_long_press_as_right_click", false);
+ GLOBAL_DEF("input_devices/pointing/android/enable_pan_and_scale_gestures", false);
+
MAIN_PRINT("Main: Load Translations and Remaps");
translation_server->setup(); //register translations, load them, etc.
diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.java b/platform/android/java/lib/src/org/godotengine/godot/Godot.java
index a60afb65952..368acecc3d0 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/Godot.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.java
@@ -34,6 +34,7 @@ import static android.content.Context.MODE_PRIVATE;
import static android.content.Context.WINDOW_SERVICE;
import org.godotengine.godot.input.GodotEditText;
+import org.godotengine.godot.input.GodotInputHandler;
import org.godotengine.godot.io.directory.DirectoryAccessHandler;
import org.godotengine.godot.io.file.FileAccessHandler;
import org.godotengine.godot.plugin.GodotPlugin;
@@ -334,6 +335,21 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
*/
@CallSuper
protected void onGodotSetupCompleted() {
+ Log.d(TAG, "OnGodotSetupCompleted");
+
+ // These properties are defined after Godot setup completion, so we retrieve them here.
+ boolean longPressEnabled = Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_long_press_as_right_click"));
+ boolean panScaleEnabled = Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_pan_and_scale_gestures"));
+
+ runOnUiThread(() -> {
+ GodotView renderView = getRenderView();
+ GodotInputHandler inputHandler = renderView != null ? renderView.getInputHandler() : null;
+ if (inputHandler != null) {
+ inputHandler.enableLongPress(longPressEnabled);
+ inputHandler.enablePanningAndScalingGestures(panScaleEnabled);
+ }
+ });
+
for (GodotPlugin plugin : pluginRegistry.getAllPlugins()) {
plugin.onGodotSetupCompleted();
}
@@ -348,6 +364,8 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
*/
@CallSuper
protected void onGodotMainLoopStarted() {
+ Log.d(TAG, "OnGodotMainLoopStarted");
+
for (GodotPlugin plugin : pluginRegistry.getAllPlugins()) {
plugin.onGodotMainLoopStarted();
}