diff options
Diffstat (limited to 'platform/android')
21 files changed, 19 insertions, 19 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index d5153fb6c0..1a77496a3b 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -1782,7 +1782,7 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport } else { min_sdk_int = min_sdk_str.to_int(); if (min_sdk_int < OPENGL_MIN_SDK_VERSION) { - return vformat(TTR("\"Min SDK\" cannot be lower than %d, which is the version needed by the Godot library."), OPENGL_MIN_SDK_VERSION); + return vformat(TTR("\"Min SDK\" cannot be lower than %d, which is the version needed by the Redot library."), OPENGL_MIN_SDK_VERSION); } } } diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 01d5d9ef92..170d9a4376 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -282,7 +282,7 @@ task copyAndRenameReleaseAab(type: Copy) { */ task validateJavaVersion { if (JavaVersion.current() != versions.javaVersion) { - throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Godot gradle builds.") + throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Redot gradle builds.") } } diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index f5555289fd..1ee87b99d9 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -152,7 +152,7 @@ task copyReleaseAARToBin(type: Copy) { task zipGradleBuild(type: Zip) { onlyIf { generateGodotTemplates.state.executed || generateDevTemplate.state.executed } doFirst { - logger.lifecycle("Generating Godot gradle build template") + logger.lifecycle("Generating Redot gradle build template") } from(fileTree(dir: 'app', excludes: ['**/build/**', '**/.gradle/**', '**/*.iml']), fileTree(dir: '.', includes: ['gradlew', 'gradlew.bat', 'gradle/**'])) include '**/*' diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon.png b/platform/android/java/lib/res/mipmap-hdpi/icon.png Binary files differindex cc6e113e89..8f5f2471f1 100644 --- a/platform/android/java/lib/res/mipmap-hdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-hdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png Binary files differindex 75e409ff74..cd15cc55e3 100644 --- a/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon.png b/platform/android/java/lib/res/mipmap-mdpi/icon.png Binary files differindex e1968fe142..249dea1ce5 100644 --- a/platform/android/java/lib/res/mipmap-mdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-mdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png Binary files differindex 982b69be1e..68737ef0b3 100644 --- a/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon.png b/platform/android/java/lib/res/mipmap-xhdpi/icon.png Binary files differindex 9281d8da48..122c219716 100644 --- a/platform/android/java/lib/res/mipmap-xhdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-xhdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png Binary files differindex 726b267ad6..a84f25f82d 100644 --- a/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon.png b/platform/android/java/lib/res/mipmap-xxhdpi/icon.png Binary files differindex 7a6b67d273..63287d1f36 100644 --- a/platform/android/java/lib/res/mipmap-xxhdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-xxhdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png Binary files differindex b0c727f74c..9b005204f1 100644 --- a/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png b/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png Binary files differindex 0881245802..d2b14a6830 100644 --- a/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png Binary files differindex 72e6f92b6e..c2c98811bb 100644 --- a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap/icon.png b/platform/android/java/lib/res/mipmap/icon.png Binary files differindex 0881245802..9134bb24eb 100644 --- a/platform/android/java/lib/res/mipmap/icon.png +++ b/platform/android/java/lib/res/mipmap/icon.png diff --git a/platform/android/java/lib/res/mipmap/icon_foreground.png b/platform/android/java/lib/res/mipmap/icon_foreground.png Binary files differindex 982b69be1e..d37f142621 100644 --- a/platform/android/java/lib/res/mipmap/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap/icon_foreground.png diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt index fa39ccb546..5b5d3e3605 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt @@ -353,15 +353,15 @@ class Godot(private val context: Context) : SensorEventListener { fileAccessHandler, useApkExpansion, ) - Log.v(TAG, "Godot native layer initialization completed: $nativeLayerInitializeCompleted") + Log.v(TAG, "Redot native layer initialization completed: $nativeLayerInitializeCompleted") } if (nativeLayerInitializeCompleted && !nativeLayerSetupCompleted) { nativeLayerSetupCompleted = GodotLib.setup(commandLine.toTypedArray(), tts) if (!nativeLayerSetupCompleted) { - throw IllegalStateException("Unable to setup the Godot engine! Aborting...") + throw IllegalStateException("Unable to setup the Redot engine! Aborting...") } else { - Log.v(TAG, "Godot native layer setup completed") + Log.v(TAG, "Redot native layer setup completed") } } } finally { diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt index 913e3d04c5..0e16f4bc6a 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt @@ -72,10 +72,10 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { val currentFragment = supportFragmentManager.findFragmentById(R.id.godot_fragment_container) if (currentFragment is GodotFragment) { - Log.v(TAG, "Reusing existing Godot fragment instance.") + Log.v(TAG, "Reusing existing Redot fragment instance.") godotFragment = currentFragment } else { - Log.v(TAG, "Creating new Godot fragment instance.") + Log.v(TAG, "Creating new Redot fragment instance.") godotFragment = initGodotInstance() supportFragmentManager.beginTransaction().replace(R.id.godot_fragment_container, godotFragment!!).setPrimaryNavigationFragment(godotFragment).commitNowAllowingStateLoss() } @@ -85,7 +85,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { protected open fun getGodotAppLayout() = R.layout.godot_app_layout override fun onDestroy() { - Log.v(TAG, "Destroying GodotActivity $this...") + Log.v(TAG, "Destroying RedotActivity $this...") super.onDestroy() } @@ -96,7 +96,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { private fun terminateGodotInstance(instance: Godot) { godotFragment?.let { if (instance === it.godot) { - Log.v(TAG, "Force quitting Godot instance") + Log.v(TAG, "Force quitting Redot instance") ProcessPhoenix.forceQuit(this) } } @@ -111,7 +111,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { // // Restarting only the activity, wouldn't be enough unless it did proper cleanup (including // releasing and reloading native libs or resetting their state somehow and clearing static data). - Log.v(TAG, "Restarting Godot instance...") + Log.v(TAG, "Restarting Redot instance...") ProcessPhoenix.triggerRebirth(this) } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java index 7e5e262b2d..42496a9025 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java @@ -68,7 +68,7 @@ public class GodotRenderer implements GLSurfaceView.Renderer { @Override public void onRenderThreadExiting() { - Log.d(TAG, "Destroying Godot Engine"); + Log.d(TAG, "Destroying Redot Engine"); GodotLib.ondestroy(); } diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java index 273774a33d..8b673407c9 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java @@ -370,7 +370,7 @@ public class GodotInputHandler implements InputManager.InputDeviceListener { Collections.sort(joystick.axes); for (int idx = 0; idx < joystick.axes.size(); idx++) { //Helps with creating new joypad mappings. - Log.i(TAG, " - Mapping Android axis " + joystick.axes.get(idx) + " to Godot axis " + idx); + Log.i(TAG, " - Mapping Android axis " + joystick.axes.get(idx) + " to Redot axis " + idx); } mJoysticksDevices.put(deviceId, joystick); diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java index 711bca02e7..8714e9e1b9 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java @@ -147,11 +147,11 @@ public final class GodotPluginRegistry { pluginName = metaDataName.substring(GODOT_PLUGIN_V2_NAME_PREFIX.length()).trim(); } else if (metaDataName.startsWith(GODOT_PLUGIN_V1_NAME_PREFIX)) { pluginName = metaDataName.substring(GODOT_PLUGIN_V1_NAME_PREFIX.length()).trim(); - Log.w(TAG, "Godot v1 plugin are deprecated in Godot 4.2 and higher: " + pluginName); + Log.w(TAG, "Redot v1 plugin are deprecated in Redot 4.2 and higher: " + pluginName); } if (!TextUtils.isEmpty(pluginName)) { - Log.i(TAG, "Initializing Godot plugin " + pluginName); + Log.i(TAG, "Initializing Redot plugin " + pluginName); // Retrieve the plugin class full name. String pluginHandleClassFullName = metaData.getString(metaDataName); @@ -171,9 +171,9 @@ public final class GodotPluginRegistry { "Meta-data plugin name does not match the value returned by the plugin handle: " + pluginName + " =/= " + pluginHandle.getPluginName()); } registry.put(pluginName, pluginHandle); - Log.i(TAG, "Completed initialization for Godot plugin " + pluginHandle.getPluginName()); + Log.i(TAG, "Completed initialization for Redot plugin " + pluginHandle.getPluginName()); } catch (Exception e) { - Log.w(TAG, "Unable to load Godot plugin " + pluginName, e); + Log.w(TAG, "Unable to load Redot plugin " + pluginName, e); } } else { Log.w(TAG, "Invalid plugin loader class for " + pluginName); @@ -181,7 +181,7 @@ public final class GodotPluginRegistry { } } } catch (Exception e) { - Log.e(TAG, "Unable load Godot Android plugins from the manifest file.", e); + Log.e(TAG, "Unable load Redot Android plugins from the manifest file.", e); } } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt index a93a7dbe09..0cb03cc871 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt @@ -107,7 +107,7 @@ internal class VkRenderer { * Invoked when the render thread is in the process of shutting down. */ fun onRenderThreadExiting() { - Log.d(TAG, "Destroying Godot Engine") + Log.d(TAG, "Destroying Redot Engine") GodotLib.ondestroy() } } |
