diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 55ad427a05..11808ec879 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,11 +1,11 @@
+ so we don't need to set them manually. -->
@@ -39,7 +39,6 @@
android:normalScreens="true"
android:smallScreens="true"
android:xlargeScreens="true" />
-
@@ -64,41 +62,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/build.gradle b/android/build.gradle
index 040a60ba47..bbb8dde198 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -212,6 +212,7 @@ android {
'normalDebug', // for debugging
'normalOptimized', // for testing/user build
'normalRelease', // for Google Play releases
+ 'goldDebug',
'goldRelease', // for Google Play releases
'vrDebug', // for VR debugging
'vrOptimized', // for VR testing
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 1011e599c5..9ca5bd3394 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -975,7 +975,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_shutdown(JNIEnv *, jclass) {
// JavaEGL. This doesn't get called on the Vulkan path.
// This gets called from onSurfaceCreated.
-extern "C" bool Java_org_ppsspp_ppsspp_NativeRenderer_displayInit(JNIEnv * env, jobject obj) {
+extern "C" jboolean Java_org_ppsspp_ppsspp_NativeRenderer_displayInit(JNIEnv * env, jobject obj) {
_assert_(useCPUThread);
INFO_LOG(Log::G3D, "NativeApp.displayInit()");
@@ -1294,7 +1294,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_joystickAxis(
}
extern "C" jboolean Java_org_ppsspp_ppsspp_NativeApp_mouseWheelEvent(
- JNIEnv *env, jclass, jint stick, jfloat x, jfloat y) {
+ JNIEnv *env, jclass, jfloat x, jfloat y) {
if (!renderer_inited)
return false;
// TODO: Mousewheel should probably be an axis instead.
@@ -1474,7 +1474,7 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_setDisplayParameters(JN
}
}
-extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_computeDesiredBackbufferDimensions() {
+extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_computeDesiredBackbufferDimensions(JNIEnv *, jclass) {
getDesiredBackbufferSize(desiredBackbufferSizeX, desiredBackbufferSizeY);
}
@@ -1563,7 +1563,7 @@ static void VulkanEmuThread(ANativeWindow *wnd);
// This runs in Vulkan mode only.
// This handles the entire lifecycle of the Vulkan context, init and exit.
-extern "C" bool JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runVulkanRenderLoop(JNIEnv * env, jobject obj, jobject _surf) {
+extern "C" jboolean JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runVulkanRenderLoop(JNIEnv * env, jobject obj, jobject _surf) {
_assert_(!useCPUThread);
if (!graphicsContext) {
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 3c5cb89192..4b5c8c2f15 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,7 +1,6 @@
- Hello World, PpssppActivity!
PPSSPP
PPSSPP game
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index b5f4e8cd77..83ca152714 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -504,7 +504,6 @@ public abstract class NativeActivity extends Activity {
}
}
- @TargetApi(Build.VERSION_CODES.GINGERBREAD)
private void updateScreenRotation(String cause) {
// Query the native application on the desired rotation.
int rot;
@@ -954,7 +953,6 @@ public abstract class NativeActivity extends Activity {
}
}
- @TargetApi(Build.VERSION_CODES.GINGERBREAD)
private InputDeviceState getInputDeviceState(InputEvent event) {
InputDevice device = event.getDevice();
if (device == null) {
@@ -1060,6 +1058,11 @@ public abstract class NativeActivity extends Activity {
}
}
+ @TargetApi(Build.VERSION_CODES.N)
+ void sendMouseDelta(float dx, float dy) {
+ NativeApp.mouseDelta(dx, dy);
+ }
+
@Override
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
public boolean onGenericMotionEvent(MotionEvent event) {
@@ -1078,9 +1081,11 @@ public abstract class NativeActivity extends Activity {
if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0) {
if ((event.getSource() & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
- float dx = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
- float dy = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
- NativeApp.mouseDelta(dx, dy);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ float dx = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
+ float dy = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+ sendMouseDelta(dx, dy);
+ }
}
switch (event.getAction()) {
@@ -1594,7 +1599,7 @@ public abstract class NativeActivity extends Activity {
if (mInfraredHelper == null) {
return false;
}
- if (params.startsWith("sircs")) {
+ if (params.startsWith("sircs") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Pattern pattern = Pattern.compile("sircs_(\\d+)_(\\d+)_(\\d+)_(\\d+)");
Matcher matcher = pattern.matcher(params);
if (!matcher.matches())
diff --git a/android/src/org/ppsspp/ppsspp/NativeSurfaceView.java b/android/src/org/ppsspp/ppsspp/NativeSurfaceView.java
index a9a21d3b2a..3dee26703f 100644
--- a/android/src/org/ppsspp/ppsspp/NativeSurfaceView.java
+++ b/android/src/org/ppsspp/ppsspp/NativeSurfaceView.java
@@ -61,7 +61,7 @@ public class NativeSurfaceView extends SurfaceView implements SensorEventListene
return ev.getToolType(pointer);
}
- @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
+ @TargetApi(Build.VERSION_CODES.N)
private void processMouseDelta(final MotionEvent ev) {
if ((ev.getSource() & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
float dx = ev.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
@@ -95,7 +95,7 @@ public class NativeSurfaceView extends SurfaceView implements SensorEventListene
break;
case MotionEvent.ACTION_MOVE: {
code = 1;
- if (Build.VERSION.SDK_INT >= 12) {
+ if (Build.VERSION.SDK_INT >= 24) {
processMouseDelta(ev);
}
break;