Merge pull request #8870 from hrydgard/android-sdk-24

Update to target Android SDK platform 24 (N)
This commit is contained in:
Henrik Rydgård
2016-07-25 01:26:04 +02:00
committed by GitHub
6 changed files with 3 additions and 6 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="23" />
android:targetSdkVersion="24" />
<uses-feature android:glEsVersion="0x00020000" />
<uses-feature android:name="android.hardware.screen.landscape" android:required="false" />
+1 -1
View File
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-23
target=android-24
@@ -399,7 +399,6 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
sz.y = NativeApp.getDesiredBackbufferHeight();
}
@SuppressWarnings("deprecation")
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -4,7 +4,6 @@ import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLDisplay;
import android.graphics.PixelFormat;
import android.opengl.GLSurfaceView.EGLConfigChooser;
import android.util.Log;
@@ -2,7 +2,6 @@ package org.ppsspp.ppsspp;
import android.app.AlertDialog;
import android.content.Intent;
import android.graphics.Point;
import android.os.Build;
import android.os.Bundle;
import android.os.Looper;
@@ -62,7 +62,6 @@ public class ShortcutActivity extends Activity {
private void showBadGameMessage() {
new Thread() {
@SuppressWarnings("deprecation")
@Override
public void run() {
Looper.prepare();
@@ -85,6 +84,7 @@ public class ShortcutActivity extends Activity {
// Event when a file is selected on file dialog.
private SimpleFileChooser.FileSelectedListener onFileSelectedListener = new SimpleFileChooser.FileSelectedListener() {
@Override
public void onFileSelected(File file) {
// create shortcut using file path
respondToShortcutRequest(file.getAbsolutePath());