[Scummvm-git-logs] scummvm master -> 1a1315ed2b0dbcff3b5d0e09b2ca436ea5eeb067

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3269bb00d4 ANDROID: Fix indentation
1a1315ed2b ANDROID: Drop androidx appcompat requirement


Commit: 3269bb00d40ad54fbe29691ede3e97556248966f
    https://github.com/scummvm/scummvm/commit/3269bb00d40ad54fbe29691ede3e97556248966f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-10-27T09:43:34+01:00

Commit Message:
ANDROID: Fix indentation

Changed paths:
    dists/android/build.gradle


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index d8a55eba685..9f3ec7db104 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -22,7 +22,7 @@ srcProperties.load(new FileInputStream(rootProject.file("src.properties")))
 
 // Enable to see use of deprecated API
 tasks.withType(JavaCompile).configureEach {
-	options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
+    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
 }
 
 //gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS_FULL
@@ -46,17 +46,17 @@ android {
         versionName "2.9.0"
         versionCode 2090001
         // versioncode must be incremented for each market upload
-		// maximum versioncode allowed by Play Store is: 2100000000
-		// After 2.8.0 release the versioncode numbering schema changed to be more immediately helpful.
-		// It now follows the format: M.mm.p[.bb][.a]
-		// (M is major release version number)
-		// (m is minor release version number)
-		// (p is patch/bugfix release number)
-		// (b is build number, eg. re-release or beta testing was done on Play Store)
-		// (a is a number indicating the target architecture (ABI)):
-		//     (1: arm-v7a, 2: arm64-v8a, 3: x86, 4: x86_64)
-		// eg. ScummVM 2.9.0 builds would have version codes: 2090001 - 2090004
-		// --------------
+        // maximum versioncode allowed by Play Store is: 2100000000
+        // After 2.8.0 release the versioncode numbering schema changed to be more immediately helpful.
+        // It now follows the format: M.mm.p[.bb][.a]
+        // (M is major release version number)
+        // (m is minor release version number)
+        // (p is patch/bugfix release number)
+        // (b is build number, eg. re-release or beta testing was done on Play Store)
+        // (a is a number indicating the target architecture (ABI)):
+        //     (1: arm-v7a, 2: arm64-v8a, 3: x86, 4: x86_64)
+        // eg. ScummVM 2.9.0 builds would have version codes: 2090001 - 2090004
+        // --------------
         // ScummVM 2.8.0:   113 - 116 (arm-v7a, arm64-v8a, x86, x86_64 respectively)
         // ScummVM 2.7.1:   109 - 112 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (release on Play Store)
         // Historical version codes:


Commit: 1a1315ed2b0dbcff3b5d0e09b2ca436ea5eeb067
    https://github.com/scummvm/scummvm/commit/1a1315ed2b0dbcff3b5d0e09b2ca436ea5eeb067
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-10-27T09:43:34+01:00

Commit Message:
ANDROID: Drop androidx appcompat requirement

Changed paths:
    backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
    dists/android/build.gradle


diff --git a/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java b/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
index 4608804e7cd..0ec68d05cfc 100644
--- a/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
+++ b/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
@@ -48,12 +48,11 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.collection.ArraySet;
-import androidx.core.content.res.ResourcesCompat;
 
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -203,7 +202,7 @@ public class CustomKeyboardView extends View implements View.OnClickListener {
 	private int mDownKey = NOT_A_KEY;
 
 	// New auxiliary set to keep track of any keys that were not released at the time of closing the keyboard
-	private ArraySet<Integer> mKeysDownCodesSet;
+	private HashSet<Integer> mKeysDownCodesSet;
 
 	private long mLastKeyTime;
 	private long mCurrentKeyTime;
@@ -421,12 +420,7 @@ public class CustomKeyboardView extends View implements View.OnClickListener {
 		mMiniKeyboardCache = new HashMap<>();
 
 		if (mKeyBackground == null) {
-//			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-//				mKeyBackground = context.getResources().getDrawable(R.drawable.btn_keyboard_key, context.getTheme());
-//			} else {
-//				mKeyBackground = context.getResources().getDrawable(R.drawable.btn_keyboard_key);
-//			}
-			mKeyBackground = ResourcesCompat.getDrawable(context.getResources(), R.drawable.btn_keyboard_key, context.getTheme());
+			mKeyBackground = CompatHelpers.DrawableCompat.getDrawable(context, R.drawable.btn_keyboard_key);
 		}
 
 		mKeyBackground.getPadding(mPadding);
@@ -438,7 +432,7 @@ public class CustomKeyboardView extends View implements View.OnClickListener {
 		mAccessibilityManager = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
 		mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
-		mKeysDownCodesSet = new ArraySet<>();
+		mKeysDownCodesSet = new HashSet<>();
 
 		resetMultiTap();
 	}
diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 9f3ec7db104..b65e04c2812 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -123,5 +123,4 @@ android {
 
 dependencies {
     implementation "androidx.annotation:annotation:1.7.1"
-    implementation "androidx.appcompat:appcompat:1.6.1"
 }