Update the Android editor flavors to avoid vendor-specific references

6 files changed, 5 insertions, 1 deletions

diff --git a/platform/android/java/editor/src/google/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/android/java/org/godotengine/editor/GodotEditor.kt
index f15d9f7768..f15d9f7768 100644
--- a/platform/android/java/editor/src/google/java/org/godotengine/editor/GodotEditor.kt
+++ b/platform/android/java/editor/src/android/java/org/godotengine/editor/GodotEditor.kt
diff --git a/platform/android/java/editor/src/meta/AndroidManifest.xml b/platform/android/java/editor/src/horizonos/AndroidManifest.xml
index 06442ac4e6..06442ac4e6 100644
--- a/platform/android/java/editor/src/meta/AndroidManifest.xml
+++ b/platform/android/java/editor/src/horizonos/AndroidManifest.xml
diff --git a/platform/android/java/editor/src/meta/assets/vr_splash.png b/platform/android/java/editor/src/horizonos/assets/vr_splash.png
index 7bddd4325a..7bddd4325a 100644
--- a/platform/android/java/editor/src/meta/assets/vr_splash.png
+++ b/platform/android/java/editor/src/horizonos/assets/vr_splash.png
diff --git a/platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt
index 328ff9a3bd..6cb08ae94b 100644
--- a/platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotEditor.kt
+++ b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt
@@ -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() {
 
diff --git a/platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotXRGame.kt b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt
index 5db2879aad..5db2879aad 100644
--- a/platform/android/java/editor/src/meta/java/org/godotengine/editor/GodotXRGame.kt
+++ b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt
diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
index d296d6ad03..7b6d1f6bd1 100644
--- a/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
+++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
@@ -517,6 +517,10 @@ abstract class BaseGodotEditor : GodotActivity() {
 			return isNativeXRDevice();
 		}
 
+		if (featureTag == "horizonos") {
+			return isHorizonOSDevice()
+		}
+
         return false
     }
 }