kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Android Java template

Browse Source
This commit is contained in:
Joshua Granick
2015-10-19 15:43:03 -07:00
parent 0a327595bc
commit 6a2eda8612
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
templates/android/template/src/org/libsdl/app/SDLActivity.java
View File

@@ -674,7 +674,7 @@ public class SDLActivity extends Activity {
} }
} }
// APK extension files support // APK expansion files support
/** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */ /** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */
private Object expansionFile; private Object expansionFile;
@@ -682,17 +682,26 @@ public class SDLActivity extends Activity {
/** com.android.vending.expansion.zipfile.ZipResourceFile's getInputStream() or null. */ /** com.android.vending.expansion.zipfile.ZipResourceFile's getInputStream() or null. */
private Method expansionFileMethod; private Method expansionFileMethod;
/**
* This method was called by SDL using JNI.
* @deprecated because of an incorrect name
*/
@Deprecated
public InputStream openAPKExtensionInputStream(String fileName) throws IOException {
return openAPKExpansionInputStream(fileName);
}
/** /**
* This method is called by SDL using JNI. * This method is called by SDL using JNI.
*/ */
public InputStream openAPKExtensionInputStream(String fileName) throws IOException { public InputStream openAPKExpansionInputStream(String fileName) throws IOException {
// Get a ZipResourceFile representing a merger of both the main and patch files // Get a ZipResourceFile representing a merger of both the main and patch files
if (expansionFile == null) { if (expansionFile == null) {
Integer mainVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION")); Integer mainVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION"));
Integer patchVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION")); Integer patchVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION"));
try { try {
// To avoid direct dependency on Google APK extension library that is // To avoid direct dependency on Google APK expansion library that is
// not a part of Android SDK we access it using reflection // not a part of Android SDK we access it using reflection
expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport") expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport")
.getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class) .getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class)
@@ -1142,11 +1151,6 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
} }
// unused
@Override
public void onDraw(Canvas canvas) {}
// Key events // Key events
@Override @Override
public boolean onKey(View v, int keyCode, KeyEvent event) { public boolean onKey(View v, int keyCode, KeyEvent event) {
@@ -1647,4 +1651,4 @@ class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
// Event was not managed // Event was not managed
return false; return false;
} }
} }