encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: keep compatibility with older JDK

This commit is contained in:
Sylvain Becker 2020-10-28 14:03:05 +01:00
parent 97cf314526
commit 311ae829c7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -198,7 +198,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
mTextEdit = null; mTextEdit = null;
mLayout = null; mLayout = null;
mClipboardHandler = null; mClipboardHandler = null;
mCursors = new Hashtable<>(); mCursors = new Hashtable<Integer, PointerIcon>();
mLastCursorID = 0; mLastCursorID = 0;
mSDLThread = null; mSDLThread = null;
mIsResumedCalled = false; mIsResumedCalled = false;
@ -1369,7 +1369,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
int[] buttonIds = args.getIntArray("buttonIds"); int[] buttonIds = args.getIntArray("buttonIds");
String[] buttonTexts = args.getStringArray("buttonTexts"); String[] buttonTexts = args.getStringArray("buttonTexts");
final SparseArray<Button> mapping = new SparseArray<>(); final SparseArray<Button> mapping = new SparseArray<Button>();
LinearLayout buttons = new LinearLayout(this); LinearLayout buttons = new LinearLayout(this);
buttons.setOrientation(LinearLayout.HORIZONTAL); buttons.setOrientation(LinearLayout.HORIZONTAL);

12
android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
View File

@ -176,7 +176,7 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
public SDLJoystickHandler_API16() { public SDLJoystickHandler_API16() {
mJoysticks = new ArrayList<>(); mJoysticks = new ArrayList<SDLJoystick>();
} }
@Override @Override
@ -192,8 +192,8 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
joystick.device_id = device_id; joystick.device_id = device_id;
joystick.name = joystickDevice.getName(); joystick.name = joystickDevice.getName();
joystick.desc = getJoystickDescriptor(joystickDevice); joystick.desc = getJoystickDescriptor(joystickDevice);
joystick.axes = new ArrayList<>(); joystick.axes = new ArrayList<InputDevice.MotionRange>();
joystick.hats = new ArrayList<>(); joystick.hats = new ArrayList<InputDevice.MotionRange>();
List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges(); List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
Collections.sort(ranges, new RangeComparator()); Collections.sort(ranges, new RangeComparator());
@ -225,7 +225,7 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
} }
if (i == deviceIds.length) { if (i == deviceIds.length) {
if (removedDevices == null) { if (removedDevices == null) {
removedDevices = new ArrayList<>(); removedDevices = new ArrayList<Integer>();
} }
removedDevices.add(device_id); removedDevices.add(device_id);
} }
@ -447,7 +447,7 @@ class SDLHapticHandler {
private final ArrayList<SDLHaptic> mHaptics; private final ArrayList<SDLHaptic> mHaptics;
public SDLHapticHandler() { public SDLHapticHandler() {
mHaptics = new ArrayList<>(); mHaptics = new ArrayList<SDLHaptic>();
} }
public void run(int device_id, float intensity, int length) { public void run(int device_id, float intensity, int length) {
@ -521,7 +521,7 @@ class SDLHapticHandler {
if (device_id != deviceId_VIBRATOR_SERVICE || !hasVibratorService) { if (device_id != deviceId_VIBRATOR_SERVICE || !hasVibratorService) {
if (i == deviceIds.length) { if (i == deviceIds.length) {
if (removedDevices == null) { if (removedDevices == null) {
removedDevices = new ArrayList<>(); removedDevices = new ArrayList<Integer>();
} }
removedDevices.add(device_id); removedDevices.add(device_id);
} }