Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #101996 from syntaxerror247/fix-swipe-to-dismiss

Browse source 
Android: Keep swipe-to-dismiss disabled by default
This commit is contained in:
Thaddeus Crews 2025-01-28 09:03:30 -06:00
commit b238fe25e1
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
platform/android/export/export_plugin.cpp
View file

@ -1005,7 +1005,7 @@ void EditorExportPlatformAndroid::_write_tmp_manifest(const Ref<EditorExportPres
void EditorExportPlatformAndroid::_fix_themes_xml(const Ref<EditorExportPreset> &p_preset) {
const String themes_xml_path = ExportTemplateManager::get_android_build_directory(p_preset).path_join("res/values/themes.xml");
bool enable_swipe_to_dismiss = p_preset->get("wear_os/swipe_to_dismiss");
bool enable_swipe_to_dismiss = p_preset->get("gesture/swipe_to_dismiss");
if (!FileAccess::exists(themes_xml_path)) {
print_error("res/values/themes.xml does not exist.");
@ -1850,10 +1850,10 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport
if (!is_package_name_valid(pn, &pn_err)) {
return TTR("Invalid package name:") + " " + pn_err;
}
} else if (p_name == "wear_os/swipe_to_dismiss") {
} else if (p_name == "gesture/swipe_to_dismiss") {
bool gradle_build_enabled = p_preset->get("gradle_build/use_gradle_build");
if (!bool(p_preset->get("wear_os/swipe_to_dismiss")) && !gradle_build_enabled) {
return TTR("\"Use Gradle Build\" must be enabled to disable \"Swipe to dismiss\".");
if (bool(p_preset->get("gesture/swipe_to_dismiss")) && !gradle_build_enabled) {
return TTR("\"Use Gradle Build\" is required to enable \"Swipe to dismiss\".");
}
} else if (p_name == "gradle_build/use_gradle_build") {
bool gradle_build_enabled = p_preset->get("gradle_build/use_gradle_build");
@ -2000,7 +2000,7 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "xr_features/xr_mode", PROPERTY_HINT_ENUM, "Regular,OpenXR"), XR_MODE_REGULAR, false, true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "wear_os/swipe_to_dismiss"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "gesture/swipe_to_dismiss"), false));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/immersive_mode"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_small"), true));
@ -2039,7 +2039,7 @@ bool EditorExportPlatformAndroid::get_export_option_visibility(const EditorExpor
p_option == "package/exclude_from_recents" ||
p_option == "package/show_in_app_library" ||
p_option == "package/show_as_launcher_app" ||
p_option == "wear_os/swipe_to_dismiss" ||
p_option == "gesture/swipe_to_dismiss" ||
p_option == "apk_expansion/enable" ||
p_option == "apk_expansion/SALT" ||
p_option == "apk_expansion/public_key") {