godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Update the Android editor flavors to avoid vendor-specific references

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2024-09-13 08:53:29 -07:00
parent 74de05a01c
commit 741efa632a
10 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
platform/android/java/editor/src/google/java/org/godotengine/editor/GodotEditor.kt → platform/android/java/editor/src/android/java/org/godotengine/editor/GodotEditor.kt
View File

0
platform/android/java/editor/src/meta/AndroidManifest.xml → platform/android/java/editor/src/horizonos/AndroidManifest.xml
View File

0
platform/android/java/editor/src/meta/assets/vr_splash.png → platform/android/java/editor/src/horizonos/assets/vr_splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

2
platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotEditor.kt → platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt
View File

@@ -36,7 +36,7 @@ import org.godotengine.godot.utils.isNativeXRDevice
/**
* Primary window of the Godot Editor.
*
* This is the implementation of the editor used when running on Meta devices.
* This is the implementation of the editor used when running on HorizonOS devices.
*/
open class GodotEditor : BaseGodotEditor() {

0
platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotXRGame.kt → platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt
View File

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

@@ -517,6 +517,10 @@ abstract class BaseGodotEditor : GodotActivity() {
return isNativeXRDevice();
}
if (featureTag == "horizonos") {
return isHorizonOSDevice()
}
return false
}
}