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

Merge pull request #47844 from m4gr3d/update_activity_result_callback

Browse Source 
Add support for forwarding callbacks from Godot's parent activity
This commit is contained in:
Rémi Verschelde 2021-04-13 10:10:29 +02:00 committed by GitHub
commit a9c29fdc1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java
View File

@ -34,6 +34,7 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.KeyEvent; import android.view.KeyEvent;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
@ -68,6 +69,24 @@ public abstract class FullScreenGodotApp extends FragmentActivity implements God
} }
} }
@CallSuper
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (godotFragment != null) {
godotFragment.onActivityResult(requestCode, resultCode, data);
}
}
@CallSuper
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (godotFragment != null) {
godotFragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
}
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (godotFragment != null) { if (godotFragment != null) {