ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary exposed intents, Add toast handler

This commit is contained in:
TwistedUmbrella 2014-04-06 23:03:44 -04:00 committed by ptitSeb
parent 03d4f59a02
commit 88b56b02a6
3 changed files with 10 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
shell/android/AndroidManifest.xml
View File

@ -87,44 +87,6 @@
<meta-data <meta-data
android:name="android.app.lib_name" android:name="android.app.lib_name"
android:value="dc" /> android:value="dc" />
<intent-filter>
<action android:name="com.reicast.LAUNCH_ROM" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.GDI"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.gdi"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.CHD"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.chd"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.CDI"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.cdi"
android:scheme="file" />
</intent-filter>
</activity> </activity>
<activity <activity
android:name=".GL2JNINative" android:name=".GL2JNINative"
@ -137,44 +99,6 @@
<meta-data <meta-data
android:name="android.app.lib_name" android:name="android.app.lib_name"
android:value="sexplay" /> android:value="sexplay" />
<intent-filter>
<action android:name="com.reicast.LAUNCH_ROM" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.GDI"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.gdi"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.CHD"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.chd"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.CDI"
android:scheme="file" />
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.cdi"
android:scheme="file" />
</intent-filter>
</activity> </activity>
<activity <activity
android:name=".config.EditVJoyActivity" android:name=".config.EditVJoyActivity"

11
shell/android/src/com/reicast/emulator/GL2JNINative.java
View File

@ -12,6 +12,7 @@ import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
@ -174,9 +175,13 @@ public class GL2JNINative extends NativeActivity {
// } else { // } else {
// pad.map[playerNum] = pad.getConsoleController(); // pad.map[playerNum] = pad.getConsoleController();
// } // }
Toast.makeText(getApplicationContext(), R.string.controller_unavailable, new Handler().post(new Runnable() {
Toast.LENGTH_SHORT).show(); public void run() {
finish(); Toast.makeText(getApplicationContext(), R.string.controller_unavailable,
Toast.LENGTH_SHORT).show();
finish();
}
});
} else if (InputDevice.getDevice(joy).getName() } else if (InputDevice.getDevice(joy).getName()
.contains(Gamepad.controllers_play) ) { .contains(Gamepad.controllers_play) ) {
for (int keys : pad.keypadZeus) { for (int keys : pad.keypadZeus) {

4
shell/android/src/com/reicast/emulator/MainActivity.java
View File

@ -420,10 +420,10 @@ public class MainActivity extends SlidingFragmentActivity implements
} else { } else {
Config.nativeact = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getBoolean(Config.pref_nativeact, Config.nativeact); Config.nativeact = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getBoolean(Config.pref_nativeact, Config.nativeact);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD && Config.nativeact) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD && Config.nativeact) {
startActivity(new Intent("com.reciast.LAUNCH_ROM", uri, getApplicationContext(), startActivity(new Intent("com.reicast.EMULATOR", uri, getApplicationContext(),
GL2JNINative.class)); GL2JNINative.class));
} else { } else {
startActivity(new Intent("com.reciast.LAUNCH_ROM", uri, getApplicationContext(), startActivity(new Intent("com.reicast.EMULATOR", uri, getApplicationContext(),
GL2JNIActivity.class)); GL2JNIActivity.class));
} }
} }