[Scummvm-git-logs] scummvm master -> 568572e2cc6fd054782deb170b2bcb9be160720b

[antoniou79]

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:
60e7ea79d2 ANDROID: Menu key on virtual keyboard is system menu now
568572e2cc ANDROID: Upgrade gradle to 4.1.1


Commit: 60e7ea79d24a15cca6400000acd4c0f7c7593dee
    https://github.com/scummvm/scummvm/commit/60e7ea79d24a15cca6400000acd4c0f7c7593dee
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-11-26T14:43:50+02:00

Commit Message:
ANDROID: Menu key on virtual keyboard is system menu now

Before it was a Media Top Menu key and did nothing

Changed paths:
    backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
    backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
    dists/android/res/xml/qwerty_alt.xml


diff --git a/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java b/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
index dae9b40c2e..9ac869c0a2 100755
--- a/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
+++ b/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java
@@ -882,6 +882,7 @@ public class CustomKeyboardView extends View implements View.OnClickListener {
     }
 
     private void detectAndSendKey(int index, int x, int y, long eventTime, boolean isRepeated, boolean isReleaseKey) {
+        //Log.d(ScummVM.LOG_TAG, "CustomKeyboardView:: index =" + index + "isRelease: "+ isReleaseKey);
         if (index != NOT_A_KEY && index < mKeys.length) {
             final CustomKeyboard.CustomKey key = mKeys[index];
             if (key.text != null) {
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java b/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
index 16e7308c3f..d4d50cd2ee 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
@@ -171,7 +171,7 @@ public class ScummVMEventsBase implements
 //			default:
 //				actionStr = e.toString();
 //		}
-//		Log.d(ScummVM.LOG_TAG, "SCUMMV-EVENTS-BASE - onKEY:::" + keyCode + " Action::" + actionStr + " View:: " + actionView); // Called
+//		Log.d(ScummVM.LOG_TAG, "SCUMMV-EVENTS-BASE - onKEY:::" + keyCode + " Action::" + actionStr); // Called
 
 		final int action = e.getAction();
 
@@ -216,7 +216,7 @@ public class ScummVMEventsBase implements
 			}
 		}
 
-		if (e.isSystem()) {
+		if (e.isSystem() || keyCode == KeyEvent.KEYCODE_MENU) {
 			// no repeats for system keys
 			if (e.getRepeatCount() > 0) {
 				return false;
@@ -356,6 +356,7 @@ public class ScummVMEventsBase implements
 		}
 
 		//_scummvm.displayMessageOnOSD("GetKey: " + keyCode + " unic=" + eventUnicodeChar+ " arg3= " + (eventUnicodeChar& KeyCharacterMap.COMBINING_ACCENT_MASK) + " meta: " + e.getMetaState());
+		//Log.d(ScummVM.LOG_TAG,"GetKey: " + keyCode + " unic=" + eventUnicodeChar+ " arg3= " + (eventUnicodeChar& KeyCharacterMap.COMBINING_ACCENT_MASK) + " meta: " + e.getMetaState());
 
 		// look in events.cpp for how this is handled
 		_scummvm.pushEvent(type,
diff --git a/dists/android/res/xml/qwerty_alt.xml b/dists/android/res/xml/qwerty_alt.xml
index bb32bf8702..bf42945a11 100644
--- a/dists/android/res/xml/qwerty_alt.xml
+++ b/dists/android/res/xml/qwerty_alt.xml
@@ -52,7 +52,7 @@
 		<CustomKey scummvm:codes="57"  scummvm:keyLabel="Alt"   scummvm:isSticky="true"/>
 		<CustomKey scummvm:codes="58"  scummvm:keyLabel="Alt"   scummvm:isSticky="true"/>
 		<CustomKey scummvm:codes="118" scummvm:keyLabel="Meta"  scummvm:isSticky="true"/>
-		<CustomKey scummvm:codes="226" scummvm:keyLabel="Menu"  scummvm:isRepeatable="true"/>
+		<CustomKey scummvm:codes="82"  scummvm:keyLabel="Menu"  scummvm:isRepeatable="true"/>
 		<CustomKey scummvm:codes="114" scummvm:keyLabel="Ctrl"  scummvm:isSticky="true"/>
 		<CustomKey scummvm:codes="60"  scummvm:keyLabel="Shift" scummvm:isSticky="true"/>
 	</CustomRow>


Commit: 568572e2cc6fd054782deb170b2bcb9be160720b
    https://github.com/scummvm/scummvm/commit/568572e2cc6fd054782deb170b2bcb9be160720b
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-11-26T14:43:51+02:00

Commit Message:
ANDROID: Upgrade gradle to 4.1.1

Changed paths:
    dists/android/build.gradle


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index a4e7539b12..cd5fb70c4a 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 
@@ -60,7 +60,17 @@ android {
         }
         release {
             debuggable false
+            // Enables code shrinking, obfuscation, and optimization for only
+            // your project's release build type.
             minifyEnabled false
+
+            // Enables resource shrinking, which is performed by the
+            // Android Gradle plugin.
+            //shrinkResources true
+
+            // Includes the default ProGuard rules files that are packaged with
+            // the Android Gradle plugin. To learn more, go to the section about
+            // R8 configuration files.
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             zipAlignEnabled true
         }