diff --git a/shell/android/AndroidManifest.xml b/shell/android/AndroidManifest.xml
index 338cdce94..52e09e2ed 100644
--- a/shell/android/AndroidManifest.xml
+++ b/shell/android/AndroidManifest.xml
@@ -44,7 +44,7 @@
@@ -91,7 +91,7 @@
diff --git a/shell/android/src/com/reicast/emulator/AboutFragment.java b/shell/android/src/com/reicast/emulator/AboutFragment.java
index b0f3a2d20..3976291c2 100644
--- a/shell/android/src/com/reicast/emulator/AboutFragment.java
+++ b/shell/android/src/com/reicast/emulator/AboutFragment.java
@@ -92,6 +92,8 @@ import android.widget.SlidingDrawer.OnDrawerOpenListener;
import android.widget.TextView;
import android.widget.Toast;
+import com.reicast.emulator.debug.GitAdapter;
+
public class AboutFragment extends Fragment {
SlidingDrawer slidingGithub;
diff --git a/shell/android/src/com/reicast/emulator/FileBrowser.java b/shell/android/src/com/reicast/emulator/FileBrowser.java
index edc7bb82b..fcdea4412 100644
--- a/shell/android/src/com/reicast/emulator/FileBrowser.java
+++ b/shell/android/src/com/reicast/emulator/FileBrowser.java
@@ -40,6 +40,8 @@ import android.widget.TextView;
import android.widget.Toast;
import com.android.util.FileUtils;
+import com.reicast.emulator.config.OptionsFragment;
+import com.reicast.emulator.emu.JNIdc;
public class FileBrowser extends Fragment {
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index f267d1c1b..ccce25311 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -29,6 +29,12 @@ import com.android.util.DreamTime;
import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu;
import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnOpenListener;
import com.jeremyfeinstein.slidingmenu.lib.app.SlidingFragmentActivity;
+import com.reicast.emulator.config.ConfigureFragment;
+import com.reicast.emulator.config.InputFragment;
+import com.reicast.emulator.config.OptionsFragment;
+import com.reicast.emulator.debug.GenerateLogs;
+import com.reicast.emulator.emu.GL2JNIActivity;
+import com.reicast.emulator.emu.JNIdc;
public class MainActivity extends SlidingFragmentActivity implements
FileBrowser.OnItemSelectedListener, OptionsFragment.OnClickListener {
diff --git a/shell/android/src/com/reicast/emulator/ConfigureFragment.java b/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/ConfigureFragment.java
rename to shell/android/src/com/reicast/emulator/config/ConfigureFragment.java
index fc8a14155..38a84bbb0 100644
--- a/shell/android/src/com/reicast/emulator/ConfigureFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.config;
import java.io.File;
import java.io.FileOutputStream;
@@ -34,6 +34,11 @@ import android.widget.TextView;
import android.widget.Toast;
import com.android.util.DreamTime;
+import com.reicast.emulator.MainActivity;
+import com.reicast.emulator.R;
+import com.reicast.emulator.debug.GenerateLogs;
+import com.reicast.emulator.emu.GL2JNIView;
+import com.reicast.emulator.emu.JNIdc;
import de.ankri.views.Switch;
diff --git a/shell/android/src/com/reicast/emulator/EditVJoyActivity.java b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
similarity index 92%
rename from shell/android/src/com/reicast/emulator/EditVJoyActivity.java
rename to shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
index 974708b98..e53997057 100644
--- a/shell/android/src/com/reicast/emulator/EditVJoyActivity.java
+++ b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.config;
import android.annotation.TargetApi;
import android.app.Activity;
@@ -18,6 +18,13 @@ import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.Toast;
+import com.reicast.emulator.MainActivity;
+import com.reicast.emulator.R;
+import com.reicast.emulator.emu.GL2JNIView;
+import com.reicast.emulator.emu.JNIdc;
+import com.reicast.emulator.input.OnScreenMenu;
+import com.reicast.emulator.input.VJoy;
+
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
public class EditVJoyActivity extends Activity {
GL2JNIView mView;
diff --git a/shell/android/src/com/reicast/emulator/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/InputFragment.java
rename to shell/android/src/com/reicast/emulator/config/InputFragment.java
index 59bf7e2a4..e5b33370a 100644
--- a/shell/android/src/com/reicast/emulator/InputFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/InputFragment.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.config;
import android.app.Activity;
import android.app.AlertDialog;
@@ -29,6 +29,9 @@ import com.bda.controller.Controller;
import com.bda.controller.ControllerListener;
import com.bda.controller.MotionEvent;
import com.bda.controller.StateEvent;
+import com.reicast.emulator.MainActivity;
+import com.reicast.emulator.R;
+import com.reicast.emulator.input.MOGAInput;
import de.ankri.views.Switch;
diff --git a/shell/android/src/com/reicast/emulator/InputModFragment.java b/shell/android/src/com/reicast/emulator/config/InputModFragment.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/InputModFragment.java
rename to shell/android/src/com/reicast/emulator/config/InputModFragment.java
index 9356f1988..ece965b2a 100644
--- a/shell/android/src/com/reicast/emulator/InputModFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/InputModFragment.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.config;
import java.io.IOException;
import java.io.InputStream;
@@ -29,6 +29,9 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
+
+import com.reicast.emulator.R;
+
import de.ankri.views.Switch;
public class InputModFragment extends Fragment {
diff --git a/shell/android/src/com/reicast/emulator/OptionsFragment.java b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java
similarity index 97%
rename from shell/android/src/com/reicast/emulator/OptionsFragment.java
rename to shell/android/src/com/reicast/emulator/config/OptionsFragment.java
index 2e978ead8..aead55b13 100644
--- a/shell/android/src/com/reicast/emulator/OptionsFragment.java
+++ b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.config;
import java.io.File;
@@ -16,6 +16,9 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
+import com.reicast.emulator.MainActivity;
+import com.reicast.emulator.R;
+
public class OptionsFragment extends Fragment {
Activity parentActivity;
diff --git a/shell/android/src/com/reicast/emulator/GenerateLogs.java b/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/GenerateLogs.java
rename to shell/android/src/com/reicast/emulator/debug/GenerateLogs.java
index 1532713be..6733360fc 100644
--- a/shell/android/src/com/reicast/emulator/GenerateLogs.java
+++ b/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.debug;
import java.io.BufferedReader;
import java.io.BufferedWriter;
diff --git a/shell/android/src/com/reicast/emulator/GitAdapter.java b/shell/android/src/com/reicast/emulator/debug/GitAdapter.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/GitAdapter.java
rename to shell/android/src/com/reicast/emulator/debug/GitAdapter.java
index 5c76d2a09..3dd7d5b85 100644
--- a/shell/android/src/com/reicast/emulator/GitAdapter.java
+++ b/shell/android/src/com/reicast/emulator/debug/GitAdapter.java
@@ -53,7 +53,7 @@
* subject to to the terms and conditions of the Apache License, Version 2.0.
*/
-package com.reicast.emulator;
+package com.reicast.emulator.debug;
import java.util.ArrayList;
import java.util.HashMap;
@@ -84,6 +84,7 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
+import com.reicast.emulator.R;
public class GitAdapter extends BaseAdapter {
diff --git a/shell/android/src/com/reicast/emulator/UploadLogs.java b/shell/android/src/com/reicast/emulator/debug/UploadLogs.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/UploadLogs.java
rename to shell/android/src/com/reicast/emulator/debug/UploadLogs.java
index 8caa31b6a..daa00137f 100644
--- a/shell/android/src/com/reicast/emulator/UploadLogs.java
+++ b/shell/android/src/com/reicast/emulator/debug/UploadLogs.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.debug;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -22,6 +22,8 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
+import com.reicast.emulator.R;
+
public class UploadLogs extends AsyncTask {
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/GL2JNIActivity.java
rename to shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
index 06fd64374..be1aa0c85 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.emu;
import java.util.Arrays;
import java.util.HashMap;
@@ -23,9 +23,14 @@ import android.view.Window;
import android.widget.PopupWindow;
import android.widget.Toast;
+import com.reicast.emulator.R;
+import com.reicast.emulator.config.ConfigureFragment;
+import com.reicast.emulator.input.MOGAInput;
+import com.reicast.emulator.input.OnScreenMenu;
+
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
public class GL2JNIActivity extends Activity {
- GL2JNIView mView;
+ public GL2JNIView mView;
OnScreenMenu menu;
PopupWindow popUp;
MOGAInput moga = new MOGAInput();
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIView.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/GL2JNIView.java
rename to shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
index 3a8f9adcc..4b982ba4d 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIView.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.emu;
import java.lang.reflect.InvocationTargetException;
@@ -28,6 +28,9 @@ import android.view.ScaleGestureDetector;
import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener;
import android.view.View;
+import com.reicast.emulator.MainActivity;
+import com.reicast.emulator.input.VJoy;
+
/**
* A simple GLSurfaceView sub-class that demonstrate how to perform
@@ -48,7 +51,7 @@ import android.view.View;
* bit depths). Failure to do so would result in an EGL_BAD_MATCH error.
*/
-class GL2JNIView extends GLSurfaceView
+public class GL2JNIView extends GLSurfaceView
{
private static String fileName;
//private AudioThread audioThread;
@@ -304,8 +307,11 @@ class GL2JNIView extends GLSurfaceView
return -1; // Invalid
}
- static int[] kcode_raw = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF };
- static int[] lt = new int[4], rt = new int[4], jx = new int[4], jy = new int[4];
+ public static int[] kcode_raw = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF };
+ public static int[] lt = new int[4];
+ public static int[] rt = new int[4];
+ public static int[] jx = new int[4];
+ public static int[] jy = new int[4];
float editLastX = 0, editLastY = 0;
diff --git a/shell/android/src/com/reicast/emulator/GLCFactory6.java b/shell/android/src/com/reicast/emulator/emu/GLCFactory6.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/GLCFactory6.java
rename to shell/android/src/com/reicast/emulator/emu/GLCFactory6.java
index 783761986..e1fdc9aff 100644
--- a/shell/android/src/com/reicast/emulator/GLCFactory6.java
+++ b/shell/android/src/com/reicast/emulator/emu/GLCFactory6.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.emu;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
diff --git a/shell/android/src/com/reicast/emulator/JNIdc.java b/shell/android/src/com/reicast/emulator/emu/JNIdc.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/JNIdc.java
rename to shell/android/src/com/reicast/emulator/emu/JNIdc.java
index 4c783d2b3..02b992704 100644
--- a/shell/android/src/com/reicast/emulator/JNIdc.java
+++ b/shell/android/src/com/reicast/emulator/emu/JNIdc.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.emu;
public class JNIdc
diff --git a/shell/android/src/com/reicast/emulator/SipEmulator.java b/shell/android/src/com/reicast/emulator/emu/SipEmulator.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/SipEmulator.java
rename to shell/android/src/com/reicast/emulator/emu/SipEmulator.java
index bb5afd88d..a20a029cc 100644
--- a/shell/android/src/com/reicast/emulator/SipEmulator.java
+++ b/shell/android/src/com/reicast/emulator/emu/SipEmulator.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.emu;
import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/input/MOGAInput.java
similarity index 96%
rename from shell/android/src/com/reicast/emulator/MOGAInput.java
rename to shell/android/src/com/reicast/emulator/input/MOGAInput.java
index 26d46446a..8fb4be4c0 100644
--- a/shell/android/src/com/reicast/emulator/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/input/MOGAInput.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.input;
/******************************************************************************/
@@ -15,6 +15,10 @@ import com.bda.controller.ControllerListener;
import com.bda.controller.KeyEvent;
import com.bda.controller.MotionEvent;
import com.bda.controller.StateEvent;
+import com.reicast.emulator.R;
+import com.reicast.emulator.emu.GL2JNIActivity;
+import com.reicast.emulator.emu.GL2JNIView;
+import com.reicast.emulator.emu.JNIdc;
/******************************************************************************/
@@ -27,12 +31,12 @@ public class MOGAInput
static final int DELAY = 1000 / 50; // 50 Hz
- static final int ACTION_CONNECTED = Controller.ACTION_CONNECTED;
+ public static final int ACTION_CONNECTED = Controller.ACTION_CONNECTED;
static final int ACTION_DISCONNECTED = Controller.ACTION_DISCONNECTED;
static final int ACTION_VERSION_MOGA = Controller.ACTION_VERSION_MOGA;
static final int ACTION_VERSION_MOGAPRO = Controller.ACTION_VERSION_MOGAPRO;
- Controller mController = null;
+ public Controller mController = null;
private Handler handler;
private String notify;
@@ -107,7 +111,7 @@ public class MOGAInput
*/
}
- protected void onCreate(Activity act)
+ public void onCreate(Activity act)
{
this.act = act;
@@ -120,17 +124,17 @@ public class MOGAInput
mController.setListener(new ExampleControllerListener(), new Handler());
}
- protected void onDestroy()
+ public void onDestroy()
{
mController.exit();
}
- protected void onPause()
+ public void onPause()
{
mController.onPause();
}
- protected void onResume()
+ public void onResume()
{
mController.onResume();
diff --git a/shell/android/src/com/reicast/emulator/OnScreenMenu.java b/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java
similarity index 95%
rename from shell/android/src/com/reicast/emulator/OnScreenMenu.java
rename to shell/android/src/com/reicast/emulator/input/OnScreenMenu.java
index fdd9f4b7d..45fa65325 100644
--- a/shell/android/src/com/reicast/emulator/OnScreenMenu.java
+++ b/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.input;
import java.io.File;
@@ -15,6 +15,12 @@ import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
+import com.reicast.emulator.MainActivity;
+import com.reicast.emulator.R;
+import com.reicast.emulator.config.ConfigureFragment;
+import com.reicast.emulator.emu.GL2JNIActivity;
+import com.reicast.emulator.emu.JNIdc;
+
public class OnScreenMenu {
private GL2JNIActivity mContext;
@@ -40,7 +46,7 @@ public class OnScreenMenu {
}
}
- PopupWindow createPopup() {
+ public PopupWindow createPopup() {
final PopupWindow popUp = new PopupWindow(mContext);
int p = getPixelsFromDp(60, mContext);
diff --git a/shell/android/src/com/reicast/emulator/VJoy.java b/shell/android/src/com/reicast/emulator/input/VJoy.java
similarity index 99%
rename from shell/android/src/com/reicast/emulator/VJoy.java
rename to shell/android/src/com/reicast/emulator/input/VJoy.java
index a516ce580..c0b6ab748 100644
--- a/shell/android/src/com/reicast/emulator/VJoy.java
+++ b/shell/android/src/com/reicast/emulator/input/VJoy.java
@@ -1,4 +1,4 @@
-package com.reicast.emulator;
+package com.reicast.emulator.input;
import android.content.Context;
import android.content.SharedPreferences;