[reverted] changes in onresume behaviour.

diff --git a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java
index ffa4f07..57fdc31 100644 (file)
--- a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java
+++ b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java
@@ -152,8 +152,7 @@ public class AndroidApplication extends Activity implements Application {
                super.onPause();        \r
        }\r
 \r
-       @Override protected void onResume () {\r
-               super.onResume();\r
+       @Override protected void onResume () {          \r
                Gdx.app = this;\r
                Gdx.input = this.getInput();\r
                Gdx.audio = this.getAudio();\r
@@ -165,8 +164,12 @@ public class AndroidApplication extends Activity implements Application {
                        if (graphics.view instanceof android.opengl.GLSurfaceView) ((android.opengl.GLSurfaceView)graphics.view).onResume();\r
                }                       \r
 \r
-               if (audio != null) \r
-                       audio.resume();         \r
+               if (audio != null) audio.resume();              \r
+               if(!firstResume)\r
+                       graphics.resume();\r
+               else\r
+                       firstResume=false;\r
+               super.onResume();\r
        }\r
 \r
        @Override protected void onDestroy () {\r

diff --git a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java
index 756c977..2379183 100644 (file)
--- a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java
+++ b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGraphics.java
@@ -281,15 +281,17 @@ public final class AndroidGraphics implements Graphics, Renderer {
                        synchronized(this) {\r
                                running = true;\r
                        }\r
-               } else {\r
-                       app.listener.resume();\r
+               }\r
+       }\r
+       \r
+       Object synch = new Object();    \r
+       void resume () {\r
+               synchronized(synch) {\r
                        running = false;\r
                        resume = true;\r
                }\r
-                       \r
        }\r
        \r
-       Object synch = new Object();    \r
        void pause () {\r
                synchronized(synch) {\r
                        running = false;        \r
@@ -332,6 +334,12 @@ public final class AndroidGraphics implements Graphics, Renderer {
                                pause = false;\r
                        }\r
 \r
+                       if (resume) {\r
+                               app.listener.resume();\r
+                               resume = false;\r
+                               running = true;\r
+                       }\r
+\r
                        if (destroy) {\r
                                app.listener.dispose();\r
                                destroy = false;\r