Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- bump android to 0.18.1

Browse Source 
- Fix Android compilation issues:
-- Fix Android API level to 9 (was incorrectly set to 11)
-- remove incorrect "@override" flag
This commit is contained in:
wagic.the.homebrew
2012-03-20 12:18:07 +00:00
parent 57627849a0
commit 2ddf1d36da
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/Android/AndroidManifest.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.wagic.app" package="net.wagic.app"
android:versionCode="180" android:versionCode="181"
android:versionName="0.18.0"> android:versionName="0.18.1">
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"></uses-permission> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"></uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
projects/mtg/Android/default.properties
+1 -1
View File
@@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=Google Inc.:Google APIs:11 target=android-9
projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
+1 -2
View File
@@ -82,7 +82,7 @@ public class SDLActivity extends Activity implements OnKeyListener{
public String mErrorMessage = ""; public String mErrorMessage = "";
public Boolean mErrorHappened = false; public Boolean mErrorHappened = false;
public final static String RES_FOLDER = "/sdcard/Wagic/Res/"; public final static String RES_FOLDER = "/sdcard/Wagic/Res/";
public static final String RES_FILENAME = "core_0180.zip"; public static final String RES_FILENAME = "core_0181.zip";
public static final String RES_URL = "http://wagic.googlecode.com/files/"; public static final String RES_URL = "http://wagic.googlecode.com/files/";
public String systemFolder = "/sdcard/Wagic/Res/"; public String systemFolder = "/sdcard/Wagic/Res/";
@@ -760,7 +760,6 @@ public class SDLActivity extends Activity implements OnKeyListener{
} }
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) { public boolean onKey(View v, int keyCode, KeyEvent event) {
if ((keyCode == KeyEvent.KEYCODE_MENU) && (KeyEvent.ACTION_DOWN == event.getAction())) if ((keyCode == KeyEvent.KEYCODE_MENU) && (KeyEvent.ACTION_DOWN == event.getAction()))
{ {