asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #50111 from madmiraal/android-remove-onkeymultiple-3.x

Browse source 
[3.x] Remove Android onKeyMultiple override
This commit is contained in:
Rémi Verschelde 2021-07-06 23:10:44 +02:00 committed by GitHub
commit 98f3c96053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java
View file

@ -96,14 +96,6 @@ public abstract class FullScreenGodotApp extends FragmentActivity implements God
}
}
@Override
public boolean onKeyMultiple(final int inKeyCode, int repeatCount, KeyEvent event) {
if (godotFragment != null && godotFragment.onKeyMultiple(inKeyCode, repeatCount, event)) {
return true;
}
return super.onKeyMultiple(inKeyCode, repeatCount, event);
}
/**
* Used to initialize the Godot fragment instance in {@link FullScreenGodotApp#onCreate(Bundle)}.
*/

25
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View file

@ -1004,31 +1004,6 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
}
}
public boolean onKeyMultiple(final int inKeyCode, int repeatCount, KeyEvent event) {
String s = event.getCharacters();
if (s == null || s.length() == 0)
return false;
final char[] cc = s.toCharArray();
int cnt = 0;
for (int i = cc.length; --i >= 0; cnt += cc[i] != 0 ? 1 : 0)
;
if (cnt == 0)
return false;
// This method will be called on the rendering thread:
mView.queueEvent(() -> {
for (int i = 0, n = cc.length; i < n; i++) {
int keyCode;
if ((keyCode = cc[i]) != 0) {
// Simulate key down and up...
GodotLib.key(0, 0, keyCode, true);
GodotLib.key(0, 0, keyCode, false);
}
}
});
return true;
}
public boolean requestPermission(String p_name) {
return PermissionsUtil.requestPermission(p_name, getActivity());
}