# HG changeset patch
# User Martin Gerhardy <martin.gerhardy@gmail.com>
# Date 1364711259 -7200
# Node ID 22b99b1c8daec9943090229f9ca88d6a2b17bd3d
# Parent  4db5f72aec552de50e7d0f066113e8110b7b2aa3
* android: made some stuff protected to allow access from your own Activity

diff -r 4db5f72aec55 -r 22b99b1c8dae android-project/src/org/libsdl/app/DummyEdit.java
--- a/android-project/src/org/libsdl/app/DummyEdit.java	Sun Mar 31 08:22:24 2013 +0200
+++ b/android-project/src/org/libsdl/app/DummyEdit.java	Sun Mar 31 08:27:39 2013 +0200
@@ -10,7 +10,7 @@
  * pan&scan region
  */
 public class DummyEdit extends View implements View.OnKeyListener {
-    InputConnection ic;
+    protected InputConnection ic;
 
     public DummyEdit(Context context) {
         super(context);
@@ -25,7 +25,6 @@
     }
 
     public boolean onKey(View v, int keyCode, KeyEvent event) {
-
         // This handles the hardware keyboard input
         if (event.isPrintingKey()) {
             if (event.getAction() == KeyEvent.ACTION_DOWN) {
diff -r 4db5f72aec55 -r 22b99b1c8dae android-project/src/org/libsdl/app/SDLActivity.java
--- a/android-project/src/org/libsdl/app/SDLActivity.java	Sun Mar 31 08:22:24 2013 +0200
+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Sun Mar 31 08:27:39 2013 +0200
@@ -27,39 +27,37 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsoluteLayout;
 
-
 /**
-    SDL Activity
-*/
+ * SDL Activity
+ */
 public class SDLActivity extends Activity {
-
     // Keep track of the paused state
     public static boolean mIsPaused;
 
     // Main components
-    private static SDLActivity mSingleton;
-    private static SDLSurface mSurface;
-    private static View mTextEdit;
-    private static ViewGroup mLayout;
+    protected static SDLActivity mSingleton;
+    protected static SDLSurface mSurface;
+    protected static View mTextEdit;
+    protected static ViewGroup mLayout;
 
     // This is what SDL runs in. It invokes SDL_main(), eventually
-    private static Thread mSDLThread;
+    protected static Thread mSDLThread;
     
     // Joystick
-    private static List<Integer> mJoyIdList;
+    protected static List<Integer> mJoyIdList;
     // TODO: Have a (somewhat) more efficient way of storing these?
-    private static List<List<Integer>> mJoyAxesLists;
+    protected static List<List<Integer>> mJoyAxesLists;
 
     // Audio
-    private static Thread mAudioThread;
-    private static AudioTrack mAudioTrack;
+    protected static Thread mAudioThread;
+    protected static AudioTrack mAudioTrack;
 
     // EGL private objects
-    private static EGLContext  mEGLContext;
-    private static EGLSurface  mEGLSurface;
-    private static EGLDisplay  mEGLDisplay;
-    private static EGLConfig   mEGLConfig;
-    private static int mGLMajor, mGLMinor;
+    protected static EGLContext  mEGLContext;
+    protected static EGLSurface  mEGLSurface;
+    protected static EGLDisplay  mEGLDisplay;
+    protected static EGLConfig   mEGLConfig;
+    protected static int mGLMajor, mGLMinor;
 
     // Load the .so
     static {
@@ -125,9 +123,9 @@
     }
 
     // Messages from the SDLMain thread
-    static final int COMMAND_CHANGE_TITLE = 1;
-    static final int COMMAND_UNUSED = 2;
-    static final int COMMAND_TEXTEDIT_HIDE = 3;
+    private static final int COMMAND_CHANGE_TITLE = 1;
+    private static final int COMMAND_UNUSED = 2;
+    private static final int COMMAND_TEXTEDIT_HIDE = 3;
 
     // Handler for the messages
     Handler commandHandler = new Handler() {
@@ -271,8 +269,7 @@
         if (mSDLThread == null) {
             mSDLThread = new Thread(new SDLMain(), "SDLThread");
             mSDLThread.start();
-        }
-        else {
+        } else {
             /*
              * Some Android variants may send multiple surfaceChanged events, so we don't need to resume every time
              * every time we get one of those events, only if it comes after surfaceDestroyed
@@ -355,7 +352,6 @@
                 SDLActivity.mGLMinor = minorVersion;
             }
             return SDLActivity.createEGLSurface();
-
         } catch(Exception e) {
             Log.v("SDL", e + "");
             for (StackTraceElement s : e.getStackTrace()) {
@@ -420,8 +416,6 @@
             egl.eglWaitGL();
 
             egl.eglSwapBuffers(SDLActivity.mEGLDisplay, SDLActivity.mEGLSurface);
-
-
         } catch(Exception e) {
             Log.v("SDL", "flipEGL(): " + e);
             for (StackTraceElement s : e.getStackTrace()) {