[Scummvm-git-logs] scummvm master -> aa5a490bc7a6a36b03fce9cdc85bbfe4dcc36221
antoniou79
a.antoniou79 at gmail.com
Mon Sep 28 14:55:26 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aa5a490bc7 ANDROID: Reduce Lint warnings
Commit: aa5a490bc7a6a36b03fce9cdc85bbfe4dcc36221
https://github.com/scummvm/scummvm/commit/aa5a490bc7a6a36b03fce9cdc85bbfe4dcc36221
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-09-28T17:55:04+03:00
Commit Message:
ANDROID: Reduce Lint warnings
Changed paths:
backends/platform/android/org/scummvm/scummvm/ScummVM.java
backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
dists/android/res/layout/main.xml
dists/android/res/values-television/margins.xml
dists/android/res/values/margins.xml
dists/android/res/values/strings.xml
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
index 0c28a83f47..e793bcfb0f 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVM.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
@@ -9,6 +9,7 @@ import android.view.SurfaceHolder;
import java.io.UnsupportedEncodingException;
import java.util.LinkedHashMap;
+import java.util.Locale;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
@@ -86,12 +87,12 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
// the orientation may reset on standby mode and the theme manager
// could assert when using a portrait resolution. so lets not do that.
if (height > width) {
- Log.d(LOG_TAG, String.format("Ignoring surfaceChanged: %dx%d (%d)",
+ Log.d(LOG_TAG, String.format(Locale.ROOT, "Ignoring surfaceChanged: %dx%d (%d)",
width, height, format));
return;
}
- Log.d(LOG_TAG, String.format("surfaceChanged: %dx%d (%d)",
+ Log.d(LOG_TAG, String.format(Locale.ROOT, "surfaceChanged: %dx%d (%d)",
width, height, format));
// store values for the native code
@@ -178,7 +179,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
EGL10.EGL_NO_CONTEXT, null);
if (_egl_context == EGL10.EGL_NO_CONTEXT)
- throw new Exception(String.format("Failed to create context: 0x%x",
+ throw new Exception(String.format(Locale.ROOT, "Failed to create context: 0x%x",
_egl.eglGetError()));
}
@@ -188,15 +189,15 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
_surface_holder, null);
if (_egl_surface == EGL10.EGL_NO_SURFACE)
- throw new Exception(String.format(
- "eglCreateWindowSurface failed: 0x%x", _egl.eglGetError()));
+ throw new Exception(String.format(Locale.ROOT,
+ "eglCreateWindowSurface failed: 0x%x", _egl.eglGetError()));
_egl.eglMakeCurrent(_egl_display, _egl_surface, _egl_surface,
_egl_context);
GL10 gl = (GL10)_egl_context.getGL();
- Log.i(LOG_TAG, String.format("Using EGL %s (%s); GL %s/%s (%s)",
+ Log.i(LOG_TAG, String.format(Locale.ROOT, "Using EGL %s (%s); GL %s/%s (%s)",
_egl.eglQueryString(_egl_display, EGL10.EGL_VERSION),
_egl.eglQueryString(_egl_display, EGL10.EGL_VENDOR),
gl.glGetString(GL10.GL_VERSION),
@@ -251,13 +252,13 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
int buffer_size_want = (_sample_rate * 2 * 2 / 20) & ~1023;
if (_buffer_size < buffer_size_want) {
- Log.w(LOG_TAG, String.format(
+ Log.w(LOG_TAG, String.format(Locale.ROOT,
"adjusting audio buffer size (was: %d)", _buffer_size));
_buffer_size = buffer_size_want;
}
- Log.i(LOG_TAG, String.format("Using %d bytes buffer for %dHz audio",
+ Log.i(LOG_TAG, String.format(Locale.ROOT, "Using %d bytes buffer for %dHz audio",
_buffer_size, _sample_rate));
_audio_track = new AudioTrack(AudioManager.STREAM_MUSIC,
@@ -269,7 +270,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
if (_audio_track.getState() != AudioTrack.STATE_INITIALIZED)
throw new Exception(
- String.format("Error initializing AudioTrack: %d",
+ String.format(Locale.ROOT, "Error initializing AudioTrack: %d",
_audio_track.getState()));
}
@@ -359,27 +360,27 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
String s;
if (get(EGL10.EGL_ALPHA_SIZE) > 0)
- s = String.format("[%d] RGBA%d%d%d%d",
+ s = String.format(Locale.ROOT, "[%d] RGBA%d%d%d%d",
get(EGL10.EGL_CONFIG_ID),
get(EGL10.EGL_RED_SIZE),
get(EGL10.EGL_GREEN_SIZE),
get(EGL10.EGL_BLUE_SIZE),
get(EGL10.EGL_ALPHA_SIZE));
else
- s = String.format("[%d] RGB%d%d%d",
+ s = String.format(Locale.ROOT, "[%d] RGB%d%d%d",
get(EGL10.EGL_CONFIG_ID),
get(EGL10.EGL_RED_SIZE),
get(EGL10.EGL_GREEN_SIZE),
get(EGL10.EGL_BLUE_SIZE));
if (get(EGL10.EGL_DEPTH_SIZE) > 0)
- s += String.format(" D%d", get(EGL10.EGL_DEPTH_SIZE));
+ s += String.format(Locale.ROOT, " D%d", get(EGL10.EGL_DEPTH_SIZE));
if (get(EGL10.EGL_STENCIL_SIZE) > 0)
- s += String.format(" S%d", get(EGL10.EGL_STENCIL_SIZE));
+ s += String.format(Locale.ROOT, " S%d", get(EGL10.EGL_STENCIL_SIZE));
if (get(EGL10.EGL_SAMPLES) > 0)
- s += String.format(" MSAAx%d", get(EGL10.EGL_SAMPLES));
+ s += String.format(Locale.ROOT, " MSAAx%d", get(EGL10.EGL_SAMPLES));
if ((get(EGL10.EGL_SURFACE_TYPE) & EGL10.EGL_WINDOW_BIT) > 0)
s += " W";
@@ -400,7 +401,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
s += " NON_CONFORMANT";
default:
- s += String.format(" unknown CAVEAT 0x%x",
+ s += String.format(Locale.ROOT, " unknown CAVEAT 0x%x",
get(EGL10.EGL_CONFIG_CAVEAT));
}
@@ -423,7 +424,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
int score = attr.weight();
- Log.d(LOG_TAG, String.format("%s (%d)", attr.toString(), score));
+ Log.d(LOG_TAG, String.format(Locale.ROOT, "%s (%d)", attr.toString(), score));
if (score > bestScore) {
res = config;
@@ -435,7 +436,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
Log.e(LOG_TAG,
"Unable to find an acceptable EGL config, expect badness.");
- Log.d(LOG_TAG, String.format("Chosen EGL config: %s",
+ Log.d(LOG_TAG, String.format(Locale.ROOT, "Chosen EGL config: %s",
new EglAttribs(res).toString()));
return res;
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
index 632adbf2de..6e108ab578 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
@@ -284,7 +284,7 @@ public class ScummVMEvents implements
@Override
final public boolean onFling(MotionEvent e1, MotionEvent e2,
float velocityX, float velocityY) {
- //Log.d(ScummVM.LOG_TAG, String.format("onFling: %s -> %s (%.3f %.3f)",
+ //Log.d(ScummVM.LOG_TAG, String.format(Locale.ROOT, "onFling: %s -> %s (%.3f %.3f)",
// e1.toString(), e2.toString(),
// velocityX, velocityY));
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index 79ce4b67d6..4e54d68673 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<org.scummvm.scummvm.EditableSurfaceView
- xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_surface"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -23,7 +21,10 @@
android:id="@+id/show_keyboard"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_marginRight="10dp"
- android:layout_marginTop="10dp" />
+ android:layout_marginEnd="10dp"
+ android:layout_marginTop="10dp"
+ android:contentDescription="@string/keyboard_toggle_btn_desc" />
</RelativeLayout>
diff --git a/dists/android/res/values-television/margins.xml b/dists/android/res/values-television/margins.xml
index df586eea34..98e3c0049e 100644
--- a/dists/android/res/values-television/margins.xml
+++ b/dists/android/res/values-television/margins.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="verticalMargin">45px</dimen>
- <dimen name="horizontalMargin">80px</dimen>
+ <dimen name="verticalMargin">45dp</dimen>
+ <dimen name="horizontalMargin">80dp</dimen>
</resources>
diff --git a/dists/android/res/values/margins.xml b/dists/android/res/values/margins.xml
index a865687b3a..6c574b2b8d 100644
--- a/dists/android/res/values/margins.xml
+++ b/dists/android/res/values/margins.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="verticalMargin">0px</dimen>
- <dimen name="horizontalMargin">0px</dimen>
+ <dimen name="verticalMargin">0dp</dimen>
+ <dimen name="horizontalMargin">0dp</dimen>
</resources>
diff --git a/dists/android/res/values/strings.xml b/dists/android/res/values/strings.xml
index 3c8ba8f966..beef262c4e 100644
--- a/dists/android/res/values/strings.xml
+++ b/dists/android/res/values/strings.xml
@@ -2,7 +2,7 @@
<resources>
<string name="app_name">ScummVM</string>
<string name="app_desc">Graphic adventure game engine</string>
- <string name="ok">Ok</string>
+ <string name="ok">OK</string>
<string name="quit">Quit</string>
<string name="scummvm_perm_plugin_label">ScummVM plugin</string>
<string name="scummvm_perm_plugin_desc">Allows the application to
@@ -31,4 +31,5 @@
engine</i> to be useful. Engines are available as separate plugin
packages, from wherever you found ScummVM.</string>
<string name="to_market">To Market</string>
+ <string name="keyboard_toggle_btn_desc">Toggle virtual keyboard</string>
</resources>
More information about the Scummvm-git-logs
mailing list