Merge pull request #637 from rh101/fix-screen-blank

Fix Android screen blank issue after unlocking device

Author: halx99

core/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java

@@ -171,8 +171,9 @@ protected void onResume() {
     	Log.d(TAG, "onResume()");
         paused = false;
         super.onResume();
-        this.hideVirtualButton();
-       	resumeIfHasFocus();
+       	if (this.hasFocus) {
+            resume();
+        }
     }
 
     @Override
@@ -181,7 +182,15 @@ public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
 
         this.hasFocus = hasFocus;
-        resumeIfHasFocus();
+        if (this.hasFocus && !paused) {
+            resume();
+        }
+    }
+
+    private void resume() {
+        this.hideVirtualButton();
+        Cocos2dxHelper.onResume();
+        mGLSurfaceView.onResume();
     }
 
     private void resumeIfHasFocus() {
@@ -190,9 +199,7 @@ private void resumeIfHasFocus() {
         boolean readyToPlay = !isDeviceLocked() && !isDeviceAsleep();
 
         if(hasFocus && readyToPlay) {
-            this.hideVirtualButton();
-        	Cocos2dxHelper.onResume();
-        	mGLSurfaceView.onResume();
+            resume();
         }
     }