diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml
index e23b36e623b..eb22fa087ad 100644
--- a/doc/classes/@GlobalScope.xml
+++ b/doc/classes/@GlobalScope.xml
@@ -2030,16 +2030,16 @@
Help key.
- Media back key. Not to be confused with the Back button on an Android device.
+ Back key.
- Media forward key.
+ Forward key.
Media stop key.
- Media refresh key.
+ Refresh key.
Volume down key.
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index 73c542d4e7e..d85983a3198 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -4266,8 +4266,14 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/show_in_file_system", TTR("Show in FileSystem")), SHOW_IN_FILE_SYSTEM);
file_menu->get_popup()->add_separator();
- file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/history_previous", TTR("History Previous"), KeyModifierMask::ALT | Key::LEFT), WINDOW_PREV);
- file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/history_next", TTR("History Next"), KeyModifierMask::ALT | Key::RIGHT), WINDOW_NEXT);
+ file_menu->get_popup()->add_shortcut(
+ ED_SHORTCUT_ARRAY("script_editor/history_previous", TTR("History Previous"),
+ { int32_t(KeyModifierMask::ALT | Key::LEFT), int32_t(Key::BACK) }),
+ WINDOW_PREV);
+ file_menu->get_popup()->add_shortcut(
+ ED_SHORTCUT_ARRAY("script_editor/history_next", TTR("History Next"),
+ { int32_t(KeyModifierMask::ALT | Key::RIGHT), int32_t(Key::FORWARD) }),
+ WINDOW_NEXT);
ED_SHORTCUT_OVERRIDE("script_editor/history_previous", "macos", KeyModifierMask::ALT | KeyModifierMask::META | Key::LEFT);
ED_SHORTCUT_OVERRIDE("script_editor/history_next", "macos", KeyModifierMask::ALT | KeyModifierMask::META | Key::RIGHT);
diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
index 38df7ada3ef..4ac4f87c3df 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
@@ -970,15 +970,10 @@ class Godot(private val context: Context) {
}
fun onBackPressed() {
- var shouldQuit = true
for (plugin in pluginRegistry.allPlugins) {
- if (plugin.onMainBackPressed()) {
- shouldQuit = false
- }
- }
- if (shouldQuit) {
- renderView?.queueOnRenderThread { GodotLib.back() }
+ plugin.onMainBackPressed()
}
+ renderView?.queueOnRenderThread { GodotLib.back() }
}
/**
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
index fb41cd00c02..36bee6ef224 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
@@ -154,10 +154,6 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
}
public boolean onKeyUp(final int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK) {
- return true;
- }
-
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
return false;
}
@@ -183,13 +179,6 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
}
public boolean onKeyDown(final int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK) {
- godot.onBackPressed();
- // press 'back' button should not terminate program
- //normal handle 'back' event in game logic
- return true;
- }
-
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
return false;
}