Android editor: Enable orientation change in Script Editor

platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt

@@ -37,7 +37,9 @@ import android.content.ComponentName
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.os.Debug
@@ -155,6 +157,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		internal const val GAME_MENU_ACTION_SET_TIME_SCALE = "setTimeScale"
 
 		private const val GAME_WORKSPACE = "Game"
+		private const val SCRIPT_WORKSPACE = "Script"
 
 		internal const val SNACKBAR_SHOW_DURATION_MS = 5000L
 
@@ -203,6 +206,10 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 
 	private val updatedCommandLineParams = ArrayList<String>()
 
+	private var changingOrientationAllowed = false
+	private var distractionFreeModeEnabled = false
+	private var activeWorkspace: String? = null
+
 	override fun getGodotAppLayout() = R.layout.godot_editor_layout
 
 	internal open fun getEditorWindowInfo() = EDITOR_MAIN_INFO
@@ -269,6 +276,14 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		setupGameMenuBar()
 	}
 
+	override fun onConfigurationChanged(newConfig: Configuration) {
+		super.onConfigurationChanged(newConfig)
+
+		// Show EditorTitleBar only in landscape due to width limitations in portrait.
+		// TODO: Enable for portrait once the title bar width is optimized.
+		EditorUtils.toggleTitleBar(newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
+	}
+
 	override fun onDestroy() {
 		gradleBuildProvider.buildEnvDisconnect()
 		super.onDestroy()
@@ -696,7 +711,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 	/**
 	 * The Godot Android Editor sets its own orientation via its AndroidManifest
 	 */
-	protected open fun overrideOrientationRequest() = true
+	protected open fun overrideOrientationRequest() = !changingOrientationAllowed
 
 	protected open fun overrideVolumeButtons() = false
 
@@ -894,6 +909,8 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 	}
 
 	override fun onEditorWorkspaceSelected(workspace: String) {
+		activeWorkspace = workspace
+
 		if (workspace == GAME_WORKSPACE && shouldShowGameMenuBar()) {
 			if (editorMessageDispatcher.bringEditorWindowToFront(EMBEDDED_RUN_GAME_INFO) || editorMessageDispatcher.bringEditorWindowToFront(RUN_GAME_INFO)) {
 				return
@@ -906,6 +923,23 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 				embeddedGameViewContainerWindow?.isVisible = true
 			}
 		}
+
+		toggleScriptEditorOrientation()
+	}
+
+	override fun onDistractionFreeModeChanged(enabled: Boolean) {
+		distractionFreeModeEnabled = enabled
+		toggleScriptEditorOrientation()
+	}
+
+	private fun toggleScriptEditorOrientation() {
+		if (activeWorkspace == SCRIPT_WORKSPACE && distractionFreeModeEnabled) {
+			changingOrientationAllowed = true
+			requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER
+		} else if (changingOrientationAllowed) {
+			requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
+			changingOrientationAllowed = false
+		}
 	}
 
 	internal open fun bringSelfToFront() {

platform/android/java/lib/src/main/java/org/godotengine/godot/Godot.kt

@@ -1308,6 +1308,11 @@ class Godot private constructor(val context: Context) {
 		primaryHost?.onEditorWorkspaceSelected(workspace)
 	}
 
+	@Keep
+	private fun nativeOnDistractionFreeModeChanged(enabled: Boolean) {
+		primaryHost?.onDistractionFreeModeChanged(enabled)
+	}
+
 	@Keep
 	private fun nativeBuildEnvConnect(callback: GodotCallable): Boolean {
 		try {

platform/android/java/lib/src/main/java/org/godotengine/godot/GodotFragment.java

@@ -496,6 +496,13 @@ public class GodotFragment extends Fragment implements IDownloaderClient, GodotH
 		}
 	}
 
+	@Override
+	public void onDistractionFreeModeChanged(Boolean enabled) {
+		if (parentHost != null) {
+			parentHost.onDistractionFreeModeChanged(enabled);
+		}
+	}
+
 	@Override
 	public BuildProvider getBuildProvider() {
 		if (parentHost != null) {

platform/android/java/lib/src/main/java/org/godotengine/godot/GodotHost.java

@@ -153,6 +153,11 @@ public interface GodotHost {
 	 */
 	default void onEditorWorkspaceSelected(String workspace) {}
 
+	/**
+	 * Triggered when the editor's distraction-free mode changes.
+	 */
+	default void onDistractionFreeModeChanged(Boolean enabled) {}
+
 	/**
 	 * Runs the specified action on a host provided thread.
 	 */

platform/android/java/lib/src/main/java/org/godotengine/godot/editor/utils/EditorUtils.kt

@@ -38,4 +38,7 @@ package org.godotengine.godot.editor.utils
 object EditorUtils {
 	@JvmStatic
 	external fun runScene(scene: String, sceneArgs: Array<String>)
+
+	@JvmStatic
+	external fun toggleTitleBar(visible: Boolean)
 }