diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-02-08 11:24:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 11:24:48 +0100 |
| commit | c4fb119f03477ad9a494ba6cdad211b35a8efcce (patch) | |
| tree | 501be7c2e9f0aef439fc7cfe6222a37b23827124 | |
| parent | 8843d9ad347e5c3be5130153aeecdf48e4fe5a14 (diff) | |
| parent | 9d83e807e7179aea4ca709c0b5a08e8f9377367f (diff) | |
Merge pull request #72816 from m4gr3d/downgrade_vulkan_warning
Downgrade the vulkan abort logic to a warning
3 files changed, 4 insertions, 5 deletions
diff --git a/platform/android/java/editor/src/main/res/values/dimens.xml b/platform/android/java/editor/src/main/res/values/dimens.xml index 03fb6184d2..98bfe40179 100644 --- a/platform/android/java/editor/src/main/res/values/dimens.xml +++ b/platform/android/java/editor/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <dimen name="editor_default_window_height">600dp</dimen> - <dimen name="editor_default_window_width">800dp</dimen> + <dimen name="editor_default_window_width">1024dp</dimen> </resources> diff --git a/platform/android/java/lib/res/values/strings.xml b/platform/android/java/lib/res/values/strings.xml index f76f597140..03752e092e 100644 --- a/platform/android/java/lib/res/values/strings.xml +++ b/platform/android/java/lib/res/values/strings.xml @@ -14,7 +14,7 @@ <string name="text_button_cancel_verify">Cancel Verification</string> <string name="text_error_title">Error!</string> <string name="error_engine_setup_message">Unable to setup the Godot Engine! Aborting…</string> - <string name="error_missing_vulkan_requirements_message">This device does not meet the requirements for Vulkan support! Aborting…</string> + <string name="error_missing_vulkan_requirements_message">Warning - this device does not meet the requirements for Vulkan support</string> <!-- APK Expansion Strings --> diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.java b/platform/android/java/lib/src/org/godotengine/godot/Godot.java index 307fa7bae1..a03da7292b 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Godot.java +++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.java @@ -83,6 +83,7 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.ProgressBar; import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.CallSuper; import androidx.annotation.Keep; @@ -277,9 +278,7 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC if (usesVulkan()) { if (!meetsVulkanRequirements(activity.getPackageManager())) { - Log.e(TAG, "Missing requirements for vulkan support! Aborting..."); - alert(R.string.error_missing_vulkan_requirements_message, R.string.text_error_title, this::forceQuit); - return false; + Log.w(TAG, "Missing requirements for vulkan support!"); } mRenderView = new GodotVulkanRenderView(activity, this); } else { |