Add support for the package/show_as_launcher_app export option

m4gr3d · Feb 5, 2025 · fc59234 · fc59234
1 parent dabe6c7
commit fc59234
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/plugin/src/main/cpp/export/export_plugin.cpp b/plugin/src/main/cpp/export/export_plugin.cpp
@@ -114,6 +114,22 @@ String OpenXREditorExportPlugin::_get_opening_activity_tag_for_panel_app() const
 			_bool_to_string(project_settings->get_setting_with_override("display/window/size/resizable")));
 }
 
+String OpenXREditorExportPlugin::_get_common_activity_intent_filter_contents() const {
+	String contents;
+
+	if (_get_bool_option("package/show_in_app_library")) {
+		contents += R"(
+						<category android:name="android.intent.category.LAUNCHER" />
+)";
+	}
+	if (_get_bool_option("package/show_as_launcher_app")) {
+		contents += R"(
+						<category android:name="android.intent.category.HOME" />
+)";
+	}
+	return contents;
+}
+
 bool OpenXREditorExportPlugin::_is_openxr_enabled() const {
 	return _get_int_option("xr_features/xr_mode", REGULAR_MODE_VALUE) == OPENXR_MODE_VALUE;
 }
@@ -264,12 +280,7 @@ String OpenXREditorExportPlugin::_get_android_manifest_activity_element_contents
 					<category android:name="org.khronos.openxr.intent.category.IMMERSIVE_HMD" />
 )";
 
-	if (_get_bool_option("package/show_in_app_library")) {
-		contents += R"(
-						<category android:name="android.intent.category.LAUNCHER" />
-)";
-	}
-
+	contents += _get_common_activity_intent_filter_contents();
 	contents += R"(
 				</intent-filter>
 )";

diff --git a/plugin/src/main/cpp/export/khronos_export_plugin.cpp b/plugin/src/main/cpp/export/khronos_export_plugin.cpp
@@ -199,11 +199,7 @@ String KhronosEditorExportPlugin::_get_android_manifest_activity_element_content
 
 )";
 
-	if (_get_bool_option("package/show_in_app_library")) {
-		contents += R"(
-						<category android:name="android.intent.category.LAUNCHER" />
-)";
-	}
+	contents += _get_common_activity_intent_filter_contents();
 
 	if (_is_khronos_htc_enabled()) {
 		contents += R"(

diff --git a/plugin/src/main/cpp/export/meta_export_plugin.cpp b/plugin/src/main/cpp/export/meta_export_plugin.cpp
@@ -554,12 +554,7 @@ String MetaEditorExportPlugin::_get_android_manifest_activity_element_contents(c
 					<category android:name="org.khronos.openxr.intent.category.IMMERSIVE_HMD" />
 )";
 
-	if (_get_bool_option("package/show_in_app_library")) {
-		contents += R"(
-						<category android:name="android.intent.category.LAUNCHER" />
-)";
-	}
-
+	contents += _get_common_activity_intent_filter_contents();
 	contents += R"(
 				</intent-filter>
 )";

diff --git a/plugin/src/main/cpp/include/export/export_plugin.h b/plugin/src/main/cpp/include/export/export_plugin.h
@@ -118,6 +118,8 @@ class OpenXREditorExportPlugin : public EditorExportPlugin {
 
 	String _get_opening_activity_tag_for_panel_app() const;
 
+	String _get_common_activity_intent_filter_contents() const;
+
 	bool _is_openxr_enabled() const;
 
 	bool _get_bool_option(const String &option) const;