godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12119 from RameshRavone/patch-12 

export onBackPress for Android Module
This commit is contained in:
Rémi Verschelde 2017-10-15 10:11:29 +02:00 committed by GitHub
parent 56908d40b2 55784b0c38
commit 8b95e3bf11
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/java/src/org/godotengine/godot/Godot.java
View File

@ -191,6 +191,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
protected void onMainPause() {}
protected void onMainResume() {}
protected void onMainDestroy() {}
protected boolean onMainBackPressed() { return false; }
protected void onGLDrawFrame(GL10 gl) {}
protected void onGLSurfaceChanged(GL10 gl, int width, int height) {} // singletons will always miss first onGLSurfaceChanged call
@ -767,9 +768,16 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
*/
@Override public void onBackPressed() {
boolean shouldQuit = true;
for(int i=0;i<singleton_count;i++) {
if (singletons[i].onMainBackPressed()) {
shouldQuit = false;
}
}
System.out.printf("** BACK REQUEST!\n");
if (mView != null) {
if (shouldQuit && mView != null) {
mView.queueEvent(new Runnable() {
@Override
public void run() {

8
platform/android/java/src/org/godotengine/godot/GodotView.java
View File

@ -285,13 +285,7 @@ public class GodotView extends GLSurfaceView implements InputDeviceListener {
@Override public boolean onKeyDown(final int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
queueEvent(new Runnable() {
@Override
public void run() {
GodotLib.back();
}
});
activity.onBackPressed();
// press 'back' button should not terminate program
//normal handle 'back' event in game logic
return true;