[Scummvm-git-logs] scummvm branch-2-2 -> 7fb6dcbf6ef2224c2d1323c7b1848c0b5b3fe185
antoniou79
a.antoniou79 at gmail.com
Tue Oct 13 11:10:21 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:
7fb6dcbf6e ANDROID: Reduce lint warnings and offer more drawable sizes
Commit: 7fb6dcbf6ef2224c2d1323c7b1848c0b5b3fe185
https://github.com/scummvm/scummvm/commit/7fb6dcbf6ef2224c2d1323c7b1848c0b5b3fe185
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-10-13T14:10:08+03:00
Commit Message:
ANDROID: Reduce lint warnings and offer more drawable sizes
Also slightly tweak position and size of keyboard icon
Changed paths:
A dists/android/res/drawable-hdpi/leanback_icon.png
A dists/android/res/drawable-hdpi/scummvm_logo.png
A dists/android/res/drawable-ldpi/ic_action_keyboard.png
A dists/android/res/drawable-ldpi/leanback_icon.png
A dists/android/res/drawable-ldpi/scummvm_logo.png
A dists/android/res/drawable-mdpi/leanback_icon.png
A dists/android/res/drawable-mdpi/scummvm_logo.png
A dists/android/res/drawable-xhdpi/scummvm_logo.png
A dists/android/res/drawable-xxhdpi/leanback_icon.png
A dists/android/res/drawable-xxhdpi/scummvm_logo.png
A dists/android/res/mipmap-ldpi/scummvm.png
R dists/android/res/drawable/scummvm.png
R dists/android/res/drawable/scummvm_big.png
backends/platform/android/org/scummvm/scummvm/ExternalStorage.java
backends/platform/android/org/scummvm/scummvm/ScummVM.java
backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
dists/android/res/drawable-hdpi/ic_action_keyboard.png
dists/android/res/drawable-mdpi/ic_action_keyboard.png
dists/android/res/drawable-xhdpi/ic_action_keyboard.png
dists/android/res/drawable-xhdpi/leanback_icon.png
dists/android/res/drawable-xxhdpi/ic_action_keyboard.png
dists/android/res/drawable/splash.xml
dists/android/res/layout/main.xml
dists/android/res/mipmap-hdpi/scummvm.png
dists/android/res/mipmap-mdpi/scummvm.png
dists/android/res/mipmap-xhdpi/scummvm.png
dists/android/res/mipmap-xxhdpi/scummvm.png
dists/android/res/mipmap-xxxhdpi/scummvm.png
diff --git a/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java b/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java
index 3908a5672c..db0f0c0de4 100644
--- a/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java
+++ b/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java
@@ -5,7 +5,6 @@ import android.os.Environment;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.Scanner;
import android.text.TextUtils;
@@ -241,7 +240,10 @@ public class ExternalStorage {
// Note that you can't pass null, or you'll get an NPE.
final File publicDirectory = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC);
// Take the parent, because we tend to get a path like /pathTo/sdCard/Music.
- addPath(Objects.requireNonNull(publicDirectory.getParentFile()).getAbsolutePath(), candidatePaths);
+ if (publicDirectory.getParentFile() != null) {
+ addPath(publicDirectory.getParentFile().getAbsolutePath(), candidatePaths);
+ }
+
// EXTERNAL_STORAGE: may not be removable.
val = System.getenv("EXTERNAL_STORAGE");
if (!TextUtils.isEmpty(val)) {
@@ -454,7 +456,7 @@ public class ExternalStorage {
mMounts.clear();
if (Environment.getDataDirectory() != null
- && !"".equals(Environment.getDataDirectory().getAbsolutePath())) {
+ && !Environment.getDataDirectory().getAbsolutePath().isEmpty()) {
File dataFilePath = new File(Environment.getDataDirectory().getAbsolutePath());
if (dataFilePath.exists() && dataFilePath.isDirectory()) {
map.add(DATA_DIRECTORY);
@@ -464,7 +466,9 @@ public class ExternalStorage {
map.add(DATA_DIRECTORY_INT);
map.add(ctx.getFilesDir().getPath());
map.add(DATA_DIRECTORY_EXT);
- map.add(Objects.requireNonNull(ctx.getExternalFilesDir(null)).getPath());
+ if (ctx.getExternalFilesDir(null) != null) {
+ map.add(ctx.getExternalFilesDir(null).getPath());
+ }
// Now go through the external storage
if (isAvailable()) { // we can read the External Storage...
@@ -485,7 +489,11 @@ public class ExternalStorage {
if (files != null) {
for (final File file : files) {
- if (file.isDirectory() && file.canRead() && (Objects.requireNonNull(file.listFiles()).length > 0)) { // it is a real directory (not a USB drive)...
+ // Check if it is a real directory (not a USB drive)...
+ if (file.isDirectory()
+ && file.canRead()
+ && file.listFiles() != null
+ && (file.listFiles().length > 0)) {
String key = file.getAbsolutePath();
if (!map.contains(key)) {
map.add(key); // Make name as directory
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
index 1cbe794e4e..e082c48991 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVM.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
@@ -1,5 +1,6 @@
package org.scummvm.scummvm;
+import androidx.annotation.NonNull;
import android.content.res.AssetManager;
import android.media.AudioAttributes;
import android.media.AudioFormat;
@@ -375,6 +376,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
return score;
}
+ @NonNull
public String toString() {
String s;
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index 2e85b2a5a6..f1a23c49e7 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -48,7 +48,6 @@ import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Objects;
import java.util.Properties;
//import android.os.Environment;
@@ -387,6 +386,8 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
_scummvm = null;
}
+
+ showKeyboardView(false);
}
@@ -638,8 +639,10 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
private static String getVersionInfoFromScummvmConfiguration(String fullIniFilePath) {
try (BufferedReader bufferedReader = new BufferedReader(new FileReader(fullIniFilePath))) {
Map<String, Properties> parsedIniMap = parseINI(bufferedReader);
- if (!parsedIniMap.isEmpty() && parsedIniMap.containsKey("scummvm")) {
- return Objects.requireNonNull(parsedIniMap.get("scummvm")).getProperty("versioninfo", "");
+ if (!parsedIniMap.isEmpty()
+ && parsedIniMap.containsKey("scummvm")
+ && parsedIniMap.get("scummvm") != null) {
+ return parsedIniMap.get("scummvm").getProperty("versioninfo", "");
}
} catch (IOException ignored) {
} catch (NullPointerException ignored) {
@@ -651,8 +654,10 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
private static String getSavepathInfoFromScummvmConfiguration(String fullIniFilePath) {
try (BufferedReader bufferedReader = new BufferedReader(new FileReader(fullIniFilePath))) {
Map<String, Properties> parsedIniMap = parseINI(bufferedReader);
- if (!parsedIniMap.isEmpty() && parsedIniMap.containsKey("scummvm")) {
- return Objects.requireNonNull(parsedIniMap.get("scummvm")).getProperty("savepath", "");
+ if (!parsedIniMap.isEmpty()
+ && parsedIniMap.containsKey("scummvm")
+ && parsedIniMap.get("scummvm") != null) {
+ return parsedIniMap.get("scummvm").getProperty("savepath", "");
}
} catch (IOException ignored) {
} catch (NullPointerException ignored) {
@@ -889,7 +894,7 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
Log.d(ScummVM.LOG_TAG, "ScummVM Config file already exists!");
Log.d(ScummVM.LOG_TAG, "Existing ScummVM INI: " + _configScummvmFile.getPath());
String existingVersionInfo = getVersionInfoFromScummvmConfiguration(_configScummvmFile.getPath());
- if (!"".equals(existingVersionInfo.trim())) {
+ if (!existingVersionInfo.trim().isEmpty()) {
Log.d(ScummVM.LOG_TAG, "Existing ScummVM Version: " + existingVersionInfo.trim());
Version tmpOldVersionFound = new Version(existingVersionInfo.trim());
if (tmpOldVersionFound.compareTo(maxOldVersionFound) > 0) {
@@ -916,49 +921,53 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
for (String oldConfigFileDescription : candidateOldLocationsOfScummVMConfigMap.keySet()) {
File oldCandidateScummVMConfig = candidateOldLocationsOfScummVMConfigMap.get(oldConfigFileDescription);
Log.d(ScummVM.LOG_TAG, "Looking for old config " + oldConfigFileDescription + " ScummVM file...");
- Log.d(ScummVM.LOG_TAG, "at Path: " + Objects.requireNonNull(oldCandidateScummVMConfig).getPath() + "...");
- if (oldCandidateScummVMConfig.exists() && oldCandidateScummVMConfig.isFile()) {
- Log.d(ScummVM.LOG_TAG, "Old config " + oldConfigFileDescription + " ScummVM file was found!");
- String existingVersionInfo = getVersionInfoFromScummvmConfiguration(oldCandidateScummVMConfig.getPath());
- if (!"".equals(existingVersionInfo.trim())) {
- Log.d(ScummVM.LOG_TAG, "Old config's ScummVM version: " + existingVersionInfo.trim());
- Version tmpOldVersionFound = new Version(existingVersionInfo.trim());
- //
- // Replace the current config.ini with another recovered,
- // if the recovered one is of higher version.
- //
- // patch for 2.2.1 Beta1: (additional check)
- // if current version max is 2.2.1 and existingVersionFoundInScummVMDataDir is 2.2.1 (meaning we have a config.ini created for 2.2.1)
- // and file location key starts with "A-" (aux external storage locations)
- // and old version found is lower than 2.2.1
- // Then: replace our current config ini and remove the recovered ini from the aux external storage
- if ((tmpOldVersionFound.compareTo(maxOldVersionFound) > 0)
- || (!existingConfigInScummVMDataDirReplacedOnce
- && existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0
- && tmpOldVersionFound.compareTo(version2_2_1_forPatch) < 0
- && oldConfigFileDescription.startsWith("A-"))
- ) {
- maxOldVersionFound = tmpOldVersionFound;
- scummVMConfigHandled = false; // invalidate the handled flag, since we found a new great(er) version so we should re-use that one
+ if (oldCandidateScummVMConfig != null) {
+ Log.d(ScummVM.LOG_TAG, "at Path: " + oldCandidateScummVMConfig.getPath() + "...");
+ if (oldCandidateScummVMConfig.exists() && oldCandidateScummVMConfig.isFile()) {
+ Log.d(ScummVM.LOG_TAG, "Old config " + oldConfigFileDescription + " ScummVM file was found!");
+ String existingVersionInfo = getVersionInfoFromScummvmConfiguration(oldCandidateScummVMConfig.getPath());
+ if (!existingVersionInfo.trim().isEmpty()) {
+ Log.d(ScummVM.LOG_TAG, "Old config's ScummVM version: " + existingVersionInfo.trim());
+ Version tmpOldVersionFound = new Version(existingVersionInfo.trim());
+ //
+ // Replace the current config.ini with another recovered,
+ // if the recovered one is of higher version.
+ //
+ // patch for 2.2.1 Beta1: (additional check)
+ // if current version max is 2.2.1 and existingVersionFoundInScummVMDataDir is 2.2.1 (meaning we have a config.ini created for 2.2.1)
+ // and file location key starts with "A-" (aux external storage locations)
+ // and old version found is lower than 2.2.1
+ // Then: replace our current config ini and remove the recovered ini from the aux external storage
+ if ((tmpOldVersionFound.compareTo(maxOldVersionFound) > 0)
+ || (!existingConfigInScummVMDataDirReplacedOnce
+ && existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0
+ && tmpOldVersionFound.compareTo(version2_2_1_forPatch) < 0
+ && oldConfigFileDescription.startsWith("A-"))
+ ) {
+ maxOldVersionFound = tmpOldVersionFound;
+ scummVMConfigHandled = false; // invalidate the handled flag, since we found a new great(er) version so we should re-use that one
+ }
+ } else {
+ Log.d(ScummVM.LOG_TAG, "Could not find info on the old config's ScummVM version. Unsupported or corrupt file?");
+ }
+ if (!scummVMConfigHandled) {
+ // We copy the old file over the new one.
+ // This will happen once during this installation, but on a subsequent one it will again copy that old config file
+ // if we don't remove it
+ copyFileUsingStream(oldCandidateScummVMConfig, _configScummvmFile);
+ Log.d(ScummVM.LOG_TAG, "Old config " + oldConfigFileDescription + " ScummVM file was renamed and overwrote the new (empty) scummvm.ini");
+ scummVMConfigHandled = true;
+ existingConfigInScummVMDataDirReplacedOnce = true;
}
- } else {
- Log.d(ScummVM.LOG_TAG, "Could not find info on the old config's ScummVM version. Unsupported or corrupt file?");
- }
- if (!scummVMConfigHandled) {
- // We copy the old file over the new one.
- // This will happen once during this installation, but on a subsequent one it will again copy that old config file
- // if we don't remove it
- copyFileUsingStream(oldCandidateScummVMConfig, _configScummvmFile);
- Log.d(ScummVM.LOG_TAG, "Old config " + oldConfigFileDescription + " ScummVM file was renamed and overwrote the new (empty) scummvm.ini");
- scummVMConfigHandled = true;
- existingConfigInScummVMDataDirReplacedOnce = true;
- }
- // Here we remove the old config
- if (oldCandidateScummVMConfig.delete()) {
- Log.d(ScummVM.LOG_TAG, "The old config " + oldConfigFileDescription + " ScummVM file is now deleted!");
+ // Here we remove the old config
+ if (oldCandidateScummVMConfig.delete()) {
+ Log.d(ScummVM.LOG_TAG, "The old config " + oldConfigFileDescription + " ScummVM file is now deleted!");
+ } else {
+ Log.d(ScummVM.LOG_TAG, "Failed to delete the old config " + oldConfigFileDescription + " ScummVM file!");
+ }
} else {
- Log.d(ScummVM.LOG_TAG, "Failed to delete the old config " + oldConfigFileDescription + " ScummVM file!");
+ Log.d(ScummVM.LOG_TAG, "...not found!");
}
} else {
Log.d(ScummVM.LOG_TAG, "...not found!");
@@ -1162,27 +1171,33 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
File iterCandidateScummVMSavesPath = candidateOldLocationsOfScummVMSavesMap.get(oldSavesPathDescription);
Log.d(ScummVM.LOG_TAG, "Looking for old saves path " + oldSavesPathDescription + "...");
try {
- Log.d(ScummVM.LOG_TAG, " at Path: " + Objects.requireNonNull(iterCandidateScummVMSavesPath).getPath());
- if (iterCandidateScummVMSavesPath.exists() && iterCandidateScummVMSavesPath.isDirectory()) {
- File[] sgfiles = iterCandidateScummVMSavesPath.listFiles();
- if (sgfiles != null) {
- Log.d(ScummVM.LOG_TAG, "Size: " + sgfiles.length);
- for (File sgfile : sgfiles) {
- smallNodeDesc = "(F)";
- if (sgfile.isDirectory()) {
- smallNodeDesc = "(D)";
+ if (iterCandidateScummVMSavesPath != null) {
+ Log.d(ScummVM.LOG_TAG, "at Path: " + iterCandidateScummVMSavesPath.getPath() + "...");
+
+ if (iterCandidateScummVMSavesPath.exists() && iterCandidateScummVMSavesPath.isDirectory()) {
+ File[] sgfiles = iterCandidateScummVMSavesPath.listFiles();
+ if (sgfiles != null) {
+ Log.d(ScummVM.LOG_TAG, "Size: " + sgfiles.length);
+ for (File sgfile : sgfiles) {
+ smallNodeDesc = "(F)";
+ if (sgfile.isDirectory()) {
+ smallNodeDesc = "(D)";
+ }
+ Log.d(ScummVM.LOG_TAG, "Name: " + smallNodeDesc + " " + sgfile.getName());
}
- Log.d(ScummVM.LOG_TAG, "Name: " + smallNodeDesc + " " + sgfile.getName());
- }
- if (sgfiles.length > maxSavesFolderFoundSize) {
- maxSavesFolderFoundSize = sgfiles.length;
- candidateOldScummVMSavesPath = iterCandidateScummVMSavesPath;
+ if (sgfiles.length > maxSavesFolderFoundSize) {
+ maxSavesFolderFoundSize = sgfiles.length;
+ candidateOldScummVMSavesPath = iterCandidateScummVMSavesPath;
+ }
}
+ } else {
+ Log.d(ScummVM.LOG_TAG, "...not found.");
}
} else {
Log.d(ScummVM.LOG_TAG, "...not found.");
}
+
} catch (Exception e) {
Log.d(ScummVM.LOG_TAG, "ScummVM Saves path exception CAUGHT!");
}
@@ -1235,7 +1250,7 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
if (_configScummvmFile.exists() && _configScummvmFile.isFile()) {
Log.d(ScummVM.LOG_TAG, "Looking into config file for save path: " + _configScummvmFile.getPath());
String persistentGlobalSavePathStr = getSavepathInfoFromScummvmConfiguration(_configScummvmFile.getPath());
- if (!"".equals(persistentGlobalSavePathStr.trim())) {
+ if (!persistentGlobalSavePathStr.trim().isEmpty()) {
Log.d(ScummVM.LOG_TAG, "Found explicit save path: " + persistentGlobalSavePathStr);
persistentGlobalSavePath = new File(persistentGlobalSavePathStr);
if (persistentGlobalSavePath.exists() && persistentGlobalSavePath.isDirectory() && persistentGlobalSavePath.listFiles() != null) {
diff --git a/dists/android/res/drawable-hdpi/ic_action_keyboard.png b/dists/android/res/drawable-hdpi/ic_action_keyboard.png
index 69491c9a8c..68fcffed97 100644
Binary files a/dists/android/res/drawable-hdpi/ic_action_keyboard.png and b/dists/android/res/drawable-hdpi/ic_action_keyboard.png differ
diff --git a/dists/android/res/drawable-hdpi/leanback_icon.png b/dists/android/res/drawable-hdpi/leanback_icon.png
new file mode 100644
index 0000000000..c9ecc220e8
Binary files /dev/null and b/dists/android/res/drawable-hdpi/leanback_icon.png differ
diff --git a/dists/android/res/drawable-hdpi/scummvm_logo.png b/dists/android/res/drawable-hdpi/scummvm_logo.png
new file mode 100644
index 0000000000..632eeed097
Binary files /dev/null and b/dists/android/res/drawable-hdpi/scummvm_logo.png differ
diff --git a/dists/android/res/drawable-ldpi/ic_action_keyboard.png b/dists/android/res/drawable-ldpi/ic_action_keyboard.png
new file mode 100644
index 0000000000..31f4da1f04
Binary files /dev/null and b/dists/android/res/drawable-ldpi/ic_action_keyboard.png differ
diff --git a/dists/android/res/drawable-ldpi/leanback_icon.png b/dists/android/res/drawable-ldpi/leanback_icon.png
new file mode 100644
index 0000000000..f46ab64fcd
Binary files /dev/null and b/dists/android/res/drawable-ldpi/leanback_icon.png differ
diff --git a/dists/android/res/drawable-ldpi/scummvm_logo.png b/dists/android/res/drawable-ldpi/scummvm_logo.png
new file mode 100644
index 0000000000..ca24115e32
Binary files /dev/null and b/dists/android/res/drawable-ldpi/scummvm_logo.png differ
diff --git a/dists/android/res/drawable-mdpi/ic_action_keyboard.png b/dists/android/res/drawable-mdpi/ic_action_keyboard.png
index 3c3b3ca7be..54daadba27 100644
Binary files a/dists/android/res/drawable-mdpi/ic_action_keyboard.png and b/dists/android/res/drawable-mdpi/ic_action_keyboard.png differ
diff --git a/dists/android/res/drawable-mdpi/leanback_icon.png b/dists/android/res/drawable-mdpi/leanback_icon.png
new file mode 100644
index 0000000000..2a6e695cd1
Binary files /dev/null and b/dists/android/res/drawable-mdpi/leanback_icon.png differ
diff --git a/dists/android/res/drawable-mdpi/scummvm_logo.png b/dists/android/res/drawable-mdpi/scummvm_logo.png
new file mode 100644
index 0000000000..d58143f955
Binary files /dev/null and b/dists/android/res/drawable-mdpi/scummvm_logo.png differ
diff --git a/dists/android/res/drawable-xhdpi/ic_action_keyboard.png b/dists/android/res/drawable-xhdpi/ic_action_keyboard.png
index 6acead08ac..422407e910 100644
Binary files a/dists/android/res/drawable-xhdpi/ic_action_keyboard.png and b/dists/android/res/drawable-xhdpi/ic_action_keyboard.png differ
diff --git a/dists/android/res/drawable-xhdpi/leanback_icon.png b/dists/android/res/drawable-xhdpi/leanback_icon.png
index 7437d1479c..c40be14075 100644
Binary files a/dists/android/res/drawable-xhdpi/leanback_icon.png and b/dists/android/res/drawable-xhdpi/leanback_icon.png differ
diff --git a/dists/android/res/drawable-xhdpi/scummvm_logo.png b/dists/android/res/drawable-xhdpi/scummvm_logo.png
new file mode 100644
index 0000000000..c115d8338a
Binary files /dev/null and b/dists/android/res/drawable-xhdpi/scummvm_logo.png differ
diff --git a/dists/android/res/drawable-xxhdpi/ic_action_keyboard.png b/dists/android/res/drawable-xxhdpi/ic_action_keyboard.png
index dae5aa6684..d403394524 100644
Binary files a/dists/android/res/drawable-xxhdpi/ic_action_keyboard.png and b/dists/android/res/drawable-xxhdpi/ic_action_keyboard.png differ
diff --git a/dists/android/res/drawable-xxhdpi/leanback_icon.png b/dists/android/res/drawable-xxhdpi/leanback_icon.png
new file mode 100644
index 0000000000..2dcc3c545a
Binary files /dev/null and b/dists/android/res/drawable-xxhdpi/leanback_icon.png differ
diff --git a/dists/android/res/drawable-xxhdpi/scummvm_logo.png b/dists/android/res/drawable-xxhdpi/scummvm_logo.png
new file mode 100644
index 0000000000..7139edfb6e
Binary files /dev/null and b/dists/android/res/drawable-xxhdpi/scummvm_logo.png differ
diff --git a/dists/android/res/drawable/scummvm.png b/dists/android/res/drawable/scummvm.png
deleted file mode 100644
index 077844c8c6..0000000000
Binary files a/dists/android/res/drawable/scummvm.png and /dev/null differ
diff --git a/dists/android/res/drawable/scummvm_big.png b/dists/android/res/drawable/scummvm_big.png
deleted file mode 100644
index b19ec3f2f3..0000000000
Binary files a/dists/android/res/drawable/scummvm_big.png and /dev/null differ
diff --git a/dists/android/res/drawable/splash.xml b/dists/android/res/drawable/splash.xml
index 7ef066a4f8..c8d44883e2 100644
--- a/dists/android/res/drawable/splash.xml
+++ b/dists/android/res/drawable/splash.xml
@@ -4,6 +4,6 @@
<item>
<bitmap
android:gravity="center"
- android:src="@drawable/scummvm_big"/>
+ android:src="@drawable/scummvm_logo"/>
</item>
</layer-list>
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index 4e54d68673..1d05a3b4d6 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -22,9 +22,9 @@
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:layout_marginRight="10dp"
- android:layout_marginEnd="10dp"
- android:layout_marginTop="10dp"
+ android:layout_marginRight="15dp"
+ android:layout_marginEnd="15dp"
+ android:layout_marginTop="15dp"
android:contentDescription="@string/keyboard_toggle_btn_desc" />
</RelativeLayout>
diff --git a/dists/android/res/mipmap-hdpi/scummvm.png b/dists/android/res/mipmap-hdpi/scummvm.png
index 22d9630905..1955d29024 100644
Binary files a/dists/android/res/mipmap-hdpi/scummvm.png and b/dists/android/res/mipmap-hdpi/scummvm.png differ
diff --git a/dists/android/res/mipmap-ldpi/scummvm.png b/dists/android/res/mipmap-ldpi/scummvm.png
new file mode 100644
index 0000000000..deb3428f83
Binary files /dev/null and b/dists/android/res/mipmap-ldpi/scummvm.png differ
diff --git a/dists/android/res/mipmap-mdpi/scummvm.png b/dists/android/res/mipmap-mdpi/scummvm.png
index 413faf4a16..5eda419835 100644
Binary files a/dists/android/res/mipmap-mdpi/scummvm.png and b/dists/android/res/mipmap-mdpi/scummvm.png differ
diff --git a/dists/android/res/mipmap-xhdpi/scummvm.png b/dists/android/res/mipmap-xhdpi/scummvm.png
index 410755be38..8ca25223c6 100644
Binary files a/dists/android/res/mipmap-xhdpi/scummvm.png and b/dists/android/res/mipmap-xhdpi/scummvm.png differ
diff --git a/dists/android/res/mipmap-xxhdpi/scummvm.png b/dists/android/res/mipmap-xxhdpi/scummvm.png
index ffd1039162..d176fbf6c2 100644
Binary files a/dists/android/res/mipmap-xxhdpi/scummvm.png and b/dists/android/res/mipmap-xxhdpi/scummvm.png differ
diff --git a/dists/android/res/mipmap-xxxhdpi/scummvm.png b/dists/android/res/mipmap-xxxhdpi/scummvm.png
index f47022bf40..db5b3df759 100644
Binary files a/dists/android/res/mipmap-xxxhdpi/scummvm.png and b/dists/android/res/mipmap-xxxhdpi/scummvm.png differ
More information about the Scummvm-git-logs
mailing list