diff options
| author | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2022-04-04 09:18:07 -0700 |
|---|---|---|
| committer | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2022-04-04 09:18:07 -0700 |
| commit | f1a7caf9bb0e37b4176cda792fe7180db267dfdc (patch) | |
| tree | 83a797bedf037a70e91b861d74437a9e919315f9 /platform/android/export | |
| parent | e659eb66a0813bdbbe9ea8a223b020b2f4aa35ca (diff) | |
Remove duplicate `resizable` settings
Diffstat (limited to 'platform/android/export')
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 3 | ||||
| -rw-r--r-- | platform/android/export/gradle_export_util.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 69ae8ed74c..a286f768f3 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -863,7 +863,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p bool classify_as_game = p_preset->get("package/classify_as_game"); bool retain_data_on_uninstall = p_preset->get("package/retain_data_on_uninstall"); bool exclude_from_recents = p_preset->get("package/exclude_from_recents"); - bool is_resizeable = p_preset->get("screen/is_resizeable"); + bool is_resizeable = bool(GLOBAL_GET("display/window/size/resizable")); Vector<String> perms; // Write permissions into the perms variable. @@ -1738,7 +1738,6 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_normal"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_large"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_xlarge"), true)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/is_resizeable"), false)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "user_data_backup/allow"), false)); diff --git a/platform/android/export/gradle_export_util.cpp b/platform/android/export/gradle_export_util.cpp index c4cf82de6c..ff7ea8f2db 100644 --- a/platform/android/export/gradle_export_util.cpp +++ b/platform/android/export/gradle_export_util.cpp @@ -259,7 +259,7 @@ String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) { "android:resizeableActivity=\"%s\">\n", bool_to_string(p_preset->get("package/exclude_from_recents")), orientation, - bool_to_string(p_preset->get("screen/is_resizeable"))); + bool_to_string(bool(GLOBAL_GET("display/window/size/resizable")))); if (uses_xr) { manifest_activity_text += " <meta-data tools:node=\"replace\" android:name=\"com.oculus.vr.focusaware\" android:value=\"true\" />\n"; } else { |