From 45eecbf13348c741870a32fa625ce868ef4bfc47 Mon Sep 17 00:00:00 2001 From: Anish Kumar Date: Sun, 19 Apr 2026 18:57:09 +0530 Subject: [PATCH] Remove the separate "Android Source" group in ExportTemplateManager --- editor/export/export_template_manager.cpp | 16 ++++------------ editor/export/export_template_manager.h | 1 - 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index 7e6175e597..385b8b6a3f 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -298,17 +298,10 @@ void ExportTemplateManager::_initialize_template_data() { { TemplateInfo info; info.name = "Android"; - info.description = TTRC("Basic Android APK template."); - info.file_list = { "android_debug.apk", "android_release.apk" }; + info.description = TTRC("Android APK template and source for Gradle builds."); + info.file_list = { "android_debug.apk", "android_release.apk", "android_source.zip" }; template_data[TemplateID::ANDROID] = info; } - { - TemplateInfo info; - info.name = TTR("Android Source"); - info.description = TTRC("Template for Gradle builds for Android."); - info.file_list = { "android_source.zip" }; - template_data[TemplateID::ANDROID_SOURCE] = info; - } { TemplateInfo info; @@ -355,7 +348,7 @@ void ExportTemplateManager::_initialize_template_data() { PlatformInfo info; info.name = "Android"; info.icon = _get_platform_icon("Android"); - info.templates = { TemplateID::ANDROID, TemplateID::ANDROID_SOURCE }; + info.templates = { TemplateID::ANDROID }; info.group = TTR("Mobile", "Platform Group"); platform_map[PlatformID::ANDROID] = info; } @@ -1134,8 +1127,7 @@ void ExportTemplateManager::_notification(int p_what) { template_data[TemplateID::WEB_EXTENSIONS].name = TTR("Web with Extensions"); template_data[TemplateID::WEB_NOTHREADS].name = TTR("Web Single-Threaded"); template_data[TemplateID::WEB_EXTENSIONS_NOTHREADS].name = TTR("Web with Extensions Single-Threaded"); - template_data[TemplateID::ANDROID_SOURCE].name = TTR("Android Source"); - template_data[TemplateID::ANDROID_SOURCE].name = TTR("ICU Data"); + template_data[TemplateID::ICU_DATA].name = TTR("ICU Data"); } break; case NOTIFICATION_THEME_CHANGED: { diff --git a/editor/export/export_template_manager.h b/editor/export/export_template_manager.h index a9fe0a8ca6..0801de4709 100644 --- a/editor/export/export_template_manager.h +++ b/editor/export/export_template_manager.h @@ -114,7 +114,6 @@ class ExportTemplateManager : public AcceptDialog { WEB_EXTENSIONS_NOTHREADS, ANDROID, - ANDROID_SOURCE, IOS,