summaryrefslogtreecommitdiffstats
path: root/platform/android/java/lib
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-06-13 17:19:27 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-06-13 17:19:27 +0200
commitde8a05f4470a506066e9fe1530fa40a9407a5709 (patch)
tree6a0edfd538b451cd965c2cc1709a9132ba3a5930 /platform/android/java/lib
parente988c1a682c9c9eb6407dc59bf6b52bd8f09277a (diff)
parentf20e21a6d6b91fee2106be2fea5f794cfed7578f (diff)
downloadredot-engine-de8a05f4470a506066e9fe1530fa40a9407a5709.tar.gz
Merge pull request #92965 from m4gr3d/fix_splash_screen
Update the Android splash screen logic
Diffstat (limited to 'platform/android/java/lib')
-rw-r--r--platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt
index 7b8fad8952..4c5e857b7a 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt
@@ -36,6 +36,7 @@ import android.content.pm.PackageManager
import android.os.Bundle
import android.util.Log
import androidx.annotation.CallSuper
+import androidx.annotation.LayoutRes
import androidx.fragment.app.FragmentActivity
import org.godotengine.godot.utils.PermissionsUtil
import org.godotengine.godot.utils.ProcessPhoenix
@@ -65,7 +66,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(R.layout.godot_app_layout)
+ setContentView(getGodotAppLayout())
handleStartIntent(intent, true)
@@ -80,6 +81,9 @@ abstract class GodotActivity : FragmentActivity(), GodotHost {
}
}
+ @LayoutRes
+ protected open fun getGodotAppLayout() = R.layout.godot_app_layout
+
override fun onDestroy() {
Log.v(TAG, "Destroying Godot app...")
super.onDestroy()