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

Add a category for peripherals to support growing numbers

This commit is contained in:
TwistedUmbrella 2014-02-13 05:51:48 -05:00
parent 734f03bfcd
commit bf5f59833a
9 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
View File

@ -23,7 +23,7 @@ import com.reicast.emulator.R;
import com.reicast.emulator.emu.GL2JNIView; import com.reicast.emulator.emu.GL2JNIView;
import com.reicast.emulator.emu.JNIdc; import com.reicast.emulator.emu.JNIdc;
import com.reicast.emulator.emu.OnScreenMenu; import com.reicast.emulator.emu.OnScreenMenu;
import com.reicast.emulator.emu.VJoy; import com.reicast.emulator.periph.VJoy;
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
public class EditVJoyActivity extends Activity { public class EditVJoyActivity extends Activity {
@ -127,7 +127,11 @@ public class EditVJoyActivity extends Activity {
if (keyCode == KeyEvent.KEYCODE_MENU if (keyCode == KeyEvent.KEYCODE_MENU
|| keyCode == KeyEvent.KEYCODE_BACK) { || keyCode == KeyEvent.KEYCODE_BACK) {
if (!popUp.isShowing()) { if (!popUp.isShowing()) {
popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 60);
} else {
popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
}
popUp.update(LayoutParams.WRAP_CONTENT, popUp.update(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT); LayoutParams.WRAP_CONTENT);
} else { } else {

2
shell/android/src/com/reicast/emulator/config/InputFragment.java
View File

@ -31,7 +31,7 @@ import com.bda.controller.MotionEvent;
import com.bda.controller.StateEvent; import com.bda.controller.StateEvent;
import com.reicast.emulator.MainActivity; import com.reicast.emulator.MainActivity;
import com.reicast.emulator.R; import com.reicast.emulator.R;
import com.reicast.emulator.emu.MOGAInput; import com.reicast.emulator.periph.MOGAInput;
import de.ankri.views.Switch; import de.ankri.views.Switch;

2
shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
View File

@ -28,6 +28,8 @@ import android.widget.Toast;
import com.reicast.emulator.R; import com.reicast.emulator.R;
import com.reicast.emulator.config.ConfigureFragment; import com.reicast.emulator.config.ConfigureFragment;
import com.reicast.emulator.periph.MOGAInput;
import com.reicast.emulator.periph.SipEmulator;
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
public class GL2JNIActivity extends Activity { public class GL2JNIActivity extends Activity {

1
shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
View File

@ -29,6 +29,7 @@ import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener;
import android.view.View; import android.view.View;
import com.reicast.emulator.MainActivity; import com.reicast.emulator.MainActivity;
import com.reicast.emulator.periph.VJoy;
/** /**

1
shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
View File

@ -19,6 +19,7 @@ import android.widget.PopupWindow;
import com.reicast.emulator.MainActivity; import com.reicast.emulator.MainActivity;
import com.reicast.emulator.R; import com.reicast.emulator.R;
import com.reicast.emulator.config.ConfigureFragment; import com.reicast.emulator.config.ConfigureFragment;
import com.reicast.emulator.periph.VmuLcd;
public class OnScreenMenu { public class OnScreenMenu {

5
shell/android/src/com/reicast/emulator/emu/MOGAInput.java → shell/android/src/com/reicast/emulator/periph/MOGAInput.java
View File

@ -1,4 +1,4 @@
package com.reicast.emulator.emu; package com.reicast.emulator.periph;
/******************************************************************************/ /******************************************************************************/
@ -16,6 +16,9 @@ import com.bda.controller.KeyEvent;
import com.bda.controller.MotionEvent; import com.bda.controller.MotionEvent;
import com.bda.controller.StateEvent; import com.bda.controller.StateEvent;
import com.reicast.emulator.R; import com.reicast.emulator.R;
import com.reicast.emulator.emu.GL2JNIActivity;
import com.reicast.emulator.emu.GL2JNIView;
import com.reicast.emulator.emu.JNIdc;
/******************************************************************************/ /******************************************************************************/

2
shell/android/src/com/reicast/emulator/emu/SipEmulator.java → shell/android/src/com/reicast/emulator/periph/SipEmulator.java
View File

@ -1,4 +1,4 @@
package com.reicast.emulator.emu; package com.reicast.emulator.periph;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;

2
shell/android/src/com/reicast/emulator/emu/VJoy.java → shell/android/src/com/reicast/emulator/periph/VJoy.java
View File

@ -1,4 +1,4 @@
package com.reicast.emulator.emu; package com.reicast.emulator.periph;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;

4
shell/android/src/com/reicast/emulator/emu/VmuLcd.java → shell/android/src/com/reicast/emulator/periph/VmuLcd.java
View File

@ -1,4 +1,6 @@
package com.reicast.emulator.emu; package com.reicast.emulator.periph;
import com.reicast.emulator.emu.OnScreenMenu;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;