Android: remove old code after Android-16 has been set as minimum requirement
diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
index 3900943..7e238a5 100644
--- a/android-project/app/build.gradle
+++ b/android-project/app/build.gradle
@@ -13,13 +13,13 @@
if (buildAsApplication) {
applicationId "org.libsdl.app"
}
- minSdkVersion 14
+ minSdkVersion 16
targetSdkVersion 26
versionCode 1
versionName "1.0"
externalNativeBuild {
ndkBuild {
- arguments "APP_PLATFORM=android-14"
+ arguments "APP_PLATFORM=android-16"
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index 7e4f363..4ac9fb1 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -245,12 +245,7 @@
mSingleton = this;
SDL.setContext(this);
- if (Build.VERSION.SDK_INT >= 11) {
- mClipboardHandler = new SDLClipboardHandler_API11();
- } else {
- /* Before API 11, no clipboard notification (eg no SDL_CLIPBOARDUPDATE) */
- mClipboardHandler = new SDLClipboardHandler_Old();
- }
+ mClipboardHandler = new SDLClipboardHandler_API11();
mHIDDeviceManager = HIDDeviceManager.acquire(this);
@@ -1035,10 +1030,8 @@
public static boolean isTextInputEvent(KeyEvent event) {
// Key pressed with Ctrl should be sent as SDL_KEYDOWN/SDL_KEYUP and not SDL_TEXTINPUT
- if (Build.VERSION.SDK_INT >= 11) {
- if (event.isCtrlPressed()) {
- return false;
- }
+ if (event.isCtrlPressed()) {
+ return false;
}
return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
@@ -1557,9 +1550,7 @@
mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
- if (Build.VERSION.SDK_INT >= 12) {
- setOnGenericMotionListener(SDLActivity.getMotionListener());
- }
+ setOnGenericMotionListener(SDLActivity.getMotionListener());
// Some arbitrary defaults to avoid a potential division by zero
mWidth = 1.0f;
@@ -1776,17 +1767,12 @@
int i = -1;
float x,y,p;
- // !!! FIXME: dump this SDK check after 2.0.4 ships and require API14.
// 12290 = Samsung DeX mode desktop mouse
if ((event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == 12290) && SDLActivity.mSeparateMouseAndTouch) {
- if (Build.VERSION.SDK_INT < 14) {
- mouseButton = 1; // all mouse buttons are the left button
- } else {
- try {
- mouseButton = (Integer) event.getClass().getMethod("getButtonState").invoke(event);
- } catch(Exception e) {
- mouseButton = 1; // oh well.
- }
+ try {
+ mouseButton = (Integer) event.getClass().getMethod("getButtonState").invoke(event);
+ } catch(Exception e) {
+ mouseButton = 1; // oh well.
}
// We need to check if we're in relative mouse mode and get the axis offset rather than the x/y values
@@ -2164,33 +2150,3 @@
}
-class SDLClipboardHandler_Old implements
- SDLClipboardHandler {
-
- protected android.text.ClipboardManager mClipMgrOld;
-
- SDLClipboardHandler_Old() {
- mClipMgrOld = (android.text.ClipboardManager) SDL.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
- }
-
- @Override
- public boolean clipboardHasText() {
- return mClipMgrOld.hasText();
- }
-
- @Override
- public String clipboardGetText() {
- CharSequence text;
- text = mClipMgrOld.getText();
- if (text != null) {
- return text.toString();
- }
- return null;
- }
-
- @Override
- public void clipboardSetText(String string) {
- mClipMgrOld.setText(string);
- }
-}
-
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
index 6c5623d..b5276b9 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -39,12 +39,8 @@
if (mJoystickHandler == null) {
if (Build.VERSION.SDK_INT >= 19) {
mJoystickHandler = new SDLJoystickHandler_API19();
- } else if (Build.VERSION.SDK_INT >= 16) {
- mJoystickHandler = new SDLJoystickHandler_API16();
- } else if (Build.VERSION.SDK_INT >= 12) {
- mJoystickHandler = new SDLJoystickHandler_API12();
} else {
- mJoystickHandler = new SDLJoystickHandler();
+ mJoystickHandler = new SDLJoystickHandler_API16();
}
}
@@ -482,21 +478,18 @@
// so the first controller seen by SDL matches what the receiver
// considers to be the first controller
- if (Build.VERSION.SDK_INT >= 16)
- {
- for (int i = deviceIds.length - 1; i > -1; i--) {
- SDLHaptic haptic = getHaptic(deviceIds[i]);
- if (haptic == null) {
- InputDevice device = InputDevice.getDevice(deviceIds[i]);
- Vibrator vib = device.getVibrator();
- if (vib.hasVibrator()) {
- haptic = new SDLHaptic();
- haptic.device_id = deviceIds[i];
- haptic.name = device.getName();
- haptic.vib = vib;
- mHaptics.add(haptic);
- SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
- }
+ for (int i = deviceIds.length - 1; i > -1; i--) {
+ SDLHaptic haptic = getHaptic(deviceIds[i]);
+ if (haptic == null) {
+ InputDevice device = InputDevice.getDevice(deviceIds[i]);
+ Vibrator vib = device.getVibrator();
+ if (vib.hasVibrator()) {
+ haptic = new SDLHaptic();
+ haptic.device_id = deviceIds[i];
+ haptic.name = device.getName();
+ haptic.vib = vib;
+ mHaptics.add(haptic);
+ SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
}
}
}
@@ -504,11 +497,7 @@
/* Check VIBRATOR_SERVICE */
Vibrator vib = (Vibrator) SDL.getContext().getSystemService(Context.VIBRATOR_SERVICE);
if (vib != null) {
- if (Build.VERSION.SDK_INT >= 11) {
- hasVibratorService = vib.hasVibrator();
- } else {
- hasVibratorService = true;
- }
+ hasVibratorService = vib.hasVibrator();
if (hasVibratorService) {
SDLHaptic haptic = getHaptic(deviceId_VIBRATOR_SERVICE);
@@ -843,4 +832,4 @@
// Relative mouse in capture mode will only have relative for X/Y
return event.getY(0);
}
-}
\ No newline at end of file
+}
