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

Merge pull request #50072 from madmiraal/android-remove-interface-modifiers

Browse Source 
Remove redundant interface modifiers from Android Java code
This commit is contained in:
Rémi Verschelde 2021-07-02 12:35:14 +02:00 committed by GitHub
commit 42184dd6d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
public static GodotNetUtils netUtils; public static GodotNetUtils netUtils;
public interface ResultCallback { public interface ResultCallback {
public void callback(int requestCode, int resultCode, Intent data); void callback(int requestCode, int resultCode, Intent data);
} }
public ResultCallback result_callback; public ResultCallback result_callback;

16
platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java
View File

@ -35,18 +35,18 @@ import org.godotengine.godot.input.GodotInputHandler;
import android.view.SurfaceView; import android.view.SurfaceView;
public interface GodotRenderView { public interface GodotRenderView {
abstract public SurfaceView getView(); SurfaceView getView();
abstract public void initInputDevices(); void initInputDevices();
abstract public void queueOnRenderThread(Runnable event); void queueOnRenderThread(Runnable event);
abstract public void onActivityPaused(); void onActivityPaused();
abstract public void onActivityResumed(); void onActivityResumed();
abstract public void onBackPressed(); void onBackPressed();
abstract public GodotInputHandler getInputHandler(); GodotInputHandler getInputHandler();
abstract public void setPointerIcon(int pointerType); void setPointerIcon(int pointerType);
} }

18
platform/android/java/lib/src/org/godotengine/godot/input/InputManagerCompat.java
View File

@ -28,14 +28,14 @@ public interface InputManagerCompat {
* @param id The device id * @param id The device id
* @return The input device or null if not found * @return The input device or null if not found
*/ */
public InputDevice getInputDevice(int id); InputDevice getInputDevice(int id);
/** /**
* Gets the ids of all input devices in the system. * Gets the ids of all input devices in the system.
* *
* @return The input device ids. * @return The input device ids.
*/ */
public int[] getInputDeviceIds(); int[] getInputDeviceIds();
/** /**
* Registers an input device listener to receive notifications about when * Registers an input device listener to receive notifications about when
@ -46,7 +46,7 @@ public interface InputManagerCompat {
* null if the listener should be invoked on the calling thread's * null if the listener should be invoked on the calling thread's
* looper. * looper.
*/ */
public void registerInputDeviceListener(InputManagerCompat.InputDeviceListener listener, void registerInputDeviceListener(InputManagerCompat.InputDeviceListener listener,
Handler handler); Handler handler);
/** /**
@ -54,7 +54,7 @@ public interface InputManagerCompat {
* *
* @param listener The listener to unregister. * @param listener The listener to unregister.
*/ */
public void unregisterInputDeviceListener(InputManagerCompat.InputDeviceListener listener); void unregisterInputDeviceListener(InputManagerCompat.InputDeviceListener listener);
/* /*
* The following three calls are to simulate V16 behavior on pre-Jellybean * The following three calls are to simulate V16 behavior on pre-Jellybean
@ -69,7 +69,7 @@ public interface InputManagerCompat {
* *
* @param event the motion event from the app * @param event the motion event from the app
*/ */
public void onGenericMotionEvent(MotionEvent event); void onGenericMotionEvent(MotionEvent event);
/** /**
* Tell the V9 input manager that it should stop polling for disconnected * Tell the V9 input manager that it should stop polling for disconnected
@ -77,7 +77,7 @@ public interface InputManagerCompat {
* might want to call it whenever your game is not active (or whenever you * might want to call it whenever your game is not active (or whenever you
* don't care about being notified of new input devices) * don't care about being notified of new input devices)
*/ */
public void onPause(); void onPause();
/** /**
* Tell the V9 input manager that it should start polling for disconnected * Tell the V9 input manager that it should start polling for disconnected
@ -85,9 +85,9 @@ public interface InputManagerCompat {
* might want to call it less often (only when the gameplay is actually * might want to call it less often (only when the gameplay is actually
* active) * active)
*/ */
public void onResume(); void onResume();
public interface InputDeviceListener { interface InputDeviceListener {
/** /**
* Called whenever the input manager detects that a device has been * Called whenever the input manager detects that a device has been
* added. This will only be called in the V9 version when a motion event * added. This will only be called in the V9 version when a motion event
@ -119,7 +119,7 @@ public interface InputManagerCompat {
/** /**
* Use this to construct a compatible InputManager. * Use this to construct a compatible InputManager.
*/ */
public static class Factory { class Factory {
/** /**
* Constructs and returns a compatible InputManger * Constructs and returns a compatible InputManger
* *