libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Move from org.inodes.gus to org.scummvm.

Browse Source
This commit is contained in:
Alyssa Milburn 2011-10-25 21:18:42 +02:00
parent 2967e2cd91
commit 44b7f3aed5
14 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backends/platform/android/android.mk
View File

@ -63,7 +63,7 @@ PATH_BUILD_CLASSES_PLUGIN_TOP = $(PATH_BUILD)/classes.plugin
PATH_STAGE_PREFIX = build.stage
PATH_STAGE_MAIN = $(PATH_STAGE_PREFIX).main
PATH_REL = org/inodes/gus/scummvm
PATH_REL = org/scummvm/scummvm
PATH_SRC_TOP = $(srcdir)/backends/platform/android
PATH_SRC = $(PATH_SRC_TOP)/$(PATH_REL)
@ -172,13 +172,13 @@ androidrelease: $(addprefix release/, $(APK_MAIN) $(APK_PLUGINS))
androidtestmain: $(APK_MAIN)
$(ADB) install -r $(APK_MAIN)
$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.inodes.gus.scummvm/.Unpacker
$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
androidtest: $(APK_MAIN) $(APK_PLUGINS)
@set -e; for apk in $^; do \
$(ADB) install -r $$apk; \
done
$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.inodes.gus.scummvm/.Unpacker
$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
# used by buildbot!
androiddistdebug: all

2
backends/platform/android/jni.cpp
View File

@ -125,7 +125,7 @@ jint JNI::onLoad(JavaVM *vm) {
if (_vm->GetEnv((void **)&env, JNI_VERSION_1_2))
return JNI_ERR;
jclass cls = env->FindClass("org/inodes/gus/scummvm/ScummVM");
jclass cls = env->FindClass("org/scummvm/scummvm/ScummVM");
if (cls == 0)
return JNI_ERR;

2
backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java → backends/platform/android/org/scummvm/scummvm/EditableSurfaceView.java
View File

@ -1,4 +1,4 @@
package org.inodes.gus.scummvm;
package org.scummvm.scummvm;
import android.content.Context;
import android.text.InputType;

4
backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java → backends/platform/android/org/scummvm/scummvm/PluginProvider.java
View File

@ -1,4 +1,4 @@
package org.inodes.gus.scummvm;
package org.scummvm.scummvm;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@ -16,7 +16,7 @@ public class PluginProvider extends BroadcastReceiver {
private final static String LOG_TAG = "ScummVM";
public final static String META_UNPACK_LIB =
"org.inodes.gus.scummvm.meta.UNPACK_LIB";
"org.scummvm.scummvm.meta.UNPACK_LIB";
public void onReceive(Context context, Intent intent) {
if (!intent.getAction().equals(ScummVMApplication.ACTION_PLUGIN_QUERY))

2
backends/platform/android/org/inodes/gus/scummvm/ScummVM.java → backends/platform/android/org/scummvm/scummvm/ScummVM.java
View File

@ -1,4 +1,4 @@
package org.inodes.gus.scummvm;
package org.scummvm.scummvm;
import android.util.Log;
import android.content.res.AssetManager;

2
backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java → backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
View File

@ -1,4 +1,4 @@
package org.inodes.gus.scummvm;
package org.scummvm.scummvm;
import android.app.Activity;
import android.app.AlertDialog;

6
backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java → backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
View File

@ -1,12 +1,12 @@
package org.inodes.gus.scummvm;
package org.scummvm.scummvm;
import android.app.Application;
import java.io.File;
public class ScummVMApplication extends Application {
public final static String ACTION_PLUGIN_QUERY = "org.inodes.gus.scummvm.action.PLUGIN_QUERY";
public final static String EXTRA_UNPACK_LIBS = "org.inodes.gus.scummvm.extra.UNPACK_LIBS";
public final static String ACTION_PLUGIN_QUERY = "org.scummvm.scummvm.action.PLUGIN_QUERY";
public final static String EXTRA_UNPACK_LIBS = "org.scummvm.scummvm.extra.UNPACK_LIBS";
private static File _cache_dir;

2
backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java → backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
View File

@ -1,4 +1,4 @@
package org.inodes.gus.scummvm;
package org.scummvm.scummvm;
import android.os.Handler;
import android.os.Message;

4
backends/platform/android/org/inodes/gus/scummvm/Unpacker.java → backends/platform/android/org/scummvm/scummvm/Unpacker.java
View File

@ -1,4 +1,4 @@
package org.inodes.gus.scummvm;
package org.scummvm.scummvm;
import android.app.Activity;
import android.app.AlertDialog;
@ -38,7 +38,7 @@ public class Unpacker extends Activity {
// TODO don't hardcode this
private final static boolean PLUGINS_ENABLED = false;
private final static String META_NEXT_ACTIVITY =
"org.inodes.gus.unpacker.nextActivity";
"org.scummvm.unpacker.nextActivity";
private ProgressBar mProgress;
private File mUnpackDest; // location to unpack into
private AsyncTask<String, Integer, Void> mUnpacker;

10
dists/android/AndroidManifest.xml
View File

@ -2,11 +2,11 @@
<!-- NB: android:versionCode needs to be bumped for formal releases -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.inodes.gus.scummvm"
package="org.scummvm.scummvm"
android:versionCode="@ANDROID_VERSIONCODE@"
android:versionName="1.5.0git"
android:installLocation="preferExternal"
android:sharedUserId="org.inodes.gus.scummvm">
android:sharedUserId="org.scummvm.scummvm">
<!-- This version works on Android 1.5 (SDK 3) and newer, but we
want Android 2.2 (SDK 8) defaults and features. -->
@ -31,8 +31,8 @@
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden">
<meta-data android:name="org.inodes.gus.unpacker.nextActivity"
android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
<meta-data android:name="org.scummvm.unpacker.nextActivity"
android:value="org.scummvm.scummvm/.ScummVMActivity"/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@ -40,7 +40,7 @@
</activity>
</application>
<permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
android:label="@string/scummvm_perm_plugin_label"
android:description="@string/scummvm_perm_plugin_desc"
android:protectionLevel="signature"/>

10
dists/android/AndroidManifest.xml.in
View File

@ -2,11 +2,11 @@
<!-- NB: android:versionCode needs to be bumped for formal releases -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.inodes.gus.scummvm"
package="org.scummvm.scummvm"
android:versionCode="@ANDROID_VERSIONCODE@"
android:versionName="@VERSION@"
android:installLocation="preferExternal"
android:sharedUserId="org.inodes.gus.scummvm">
android:sharedUserId="org.scummvm.scummvm">
<!-- This version works on Android 1.5 (SDK 3) and newer, but we
want Android 2.2 (SDK 8) defaults and features. -->
@ -31,8 +31,8 @@
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden">
<meta-data android:name="org.inodes.gus.unpacker.nextActivity"
android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
<meta-data android:name="org.scummvm.unpacker.nextActivity"
android:value="org.scummvm.scummvm/.ScummVMActivity"/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@ -40,7 +40,7 @@
</activity>
</application>
<permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
android:label="@string/scummvm_perm_plugin_label"
android:description="@string/scummvm_perm_plugin_desc"
android:protectionLevel="signature"/>

14
dists/android/plugin-manifest.xml
View File

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
android:versionCode="@PLUGIN_VERSION_CODE@"
android:versionName="1.5.0git"
android:installLocation="preferExternal"
android:sharedUserId="org.inodes.gus.scummvm">
android:sharedUserId="org.scummvm.scummvm">
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
<application android:label="@string/app_name"
android:description="@string/app_desc"
android:icon="@drawable/scummvm">
<receiver android:name="org.inodes.gus.scummvm.PluginProvider"
android:process="org.inodes.gus.scummvm">
<receiver android:name="org.scummvm.scummvm.PluginProvider"
android:process="org.scummvm.scummvm">
<intent-filter>
<action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/>
<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
<category android:name="android.intent.category.INFO"/>
</intent-filter>
<meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB"
<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
</receiver>
</application>
<uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/>
<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
<uses-configuration android:reqFiveWayNav="true"
android:reqKeyboardType="qwerty"/>

14
dists/android/plugin-manifest.xml.in
View File

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
android:versionCode="@PLUGIN_VERSION_CODE@"
android:versionName="@VERSION@"
android:installLocation="preferExternal"
android:sharedUserId="org.inodes.gus.scummvm">
android:sharedUserId="org.scummvm.scummvm">
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
<application android:label="@string/app_name"
android:description="@string/app_desc"
android:icon="@drawable/scummvm">
<receiver android:name="org.inodes.gus.scummvm.PluginProvider"
android:process="org.inodes.gus.scummvm">
<receiver android:name="org.scummvm.scummvm.PluginProvider"
android:process="org.scummvm.scummvm">
<intent-filter>
<action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/>
<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
<category android:name="android.intent.category.INFO"/>
</intent-filter>
<meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB"
<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
</receiver>
</application>
<uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/>
<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
<uses-configuration android:reqFiveWayNav="true"
android:reqKeyboardType="qwerty"/>

2
dists/android/res/layout/main.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<org.inodes.gus.scummvm.EditableSurfaceView
<org.scummvm.scummvm.EditableSurfaceView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_surface"
android:layout_width="fill_parent"