summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aa59642)
raw | patch | inline | side by side (parent: aa59642)
author | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Sun, 4 Mar 2018 15:27:34 +0000 (18:27 +0300) | ||
committer | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
Sat, 17 Mar 2018 00:04:27 +0000 (02:04 +0200) |
index e4b81a339e375fcf0861deccd28e2d407aab6372..c1be47460beac11ab55f1393582987e345d5569e 100644 (file)
android:icon="@drawable/ic_launcher"
android:allowBackup="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:hardwareAccelerated="true" >
+ android:hardwareAccelerated="true"
+ android:debuggable="true" >
<activity android:name="Doom2DF"
android:label="Doom2D Forever"
android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/android/README b/android/README
index af6f4fc1140ddb109e1d7347925963e4f745b3e5..e99a2f6342225d6ecd78920a7b44c8ef31af4453 100644 (file)
--- a/android/README
+++ b/android/README
Requirements:
* Android SDK build-tools >= 19.1.0;
-* Android SDK platforms >= android-19;
+* Android SDK platforms >= android-16;
* Android NDK >= r16b;
* Open JDK >= 8;
* FPC >= 3.0.4;
bin/d2df.unsigned.apk androiddebugkey
```
-Where ${ANDROID_JAR} is path to android.jar file. Typically placed in ~/Android/android-sdk/platforms/android-19/android.jar.
+Where ${ANDROID_JAR} is path to android.jar file. Typically placed in ~/Android/android-sdk/platforms/android-16/android.jar.
diff --git a/android/src/org/libsdl/app/SDLActivity.java b/android/src/org/libsdl/app/SDLActivity.java
index 9119473f534fd698aa83970175ab9bd58f43cbd1..57f931e356934049995e79404f0537a88dcb0c82 100644 (file)
import java.io.InputStream;
import java.util.Arrays;
import java.lang.reflect.Method;
-import java.util.Objects;
import android.app.*;
import android.content.*;
{
int orientation = -1;
- if (!Objects.equals(hint, "")) {
+ if (hint != null && !hint.equals("")) {
if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
} else if (hint.contains("LandscapeRight")) {
diff --git a/android/src/org/libsdl/app/SDLControllerManager.java b/android/src/org/libsdl/app/SDLControllerManager.java
index 36294422fc36258f21f271400a975808b57e1073..1f21eab1fd1303c91391da130b0a47074db3181a 100644 (file)
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.Objects;
import android.content.Context;
import android.os.*;
public String getJoystickDescriptor(InputDevice joystickDevice) {
String desc = joystickDevice.getDescriptor();
- if (desc != null && !Objects.equals(desc, "")) {
+ if (desc != null && !desc.equals("")) {
return desc;
}