removed unnecessary checks for pause/resume

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -171,7 +171,7 @@ public void surfaceChanged() {
   @Override
   public void setSize(int iwidth, int iheight) {
     // OR with prev value in case setSize() gets called twice before the renderer has the chance to resize
-    sized |= iwidth != width || iheight != height;
+    sized = iwidth != width || iheight != height;
     System.out.println("======================> RESIZING AT FRAME " + parent.frameCount + " FROM " + width + "x" + height + " to " + iwidth + "x" + iheight);
     super.setSize(iwidth, iheight);
   }
@@ -2067,14 +2067,13 @@ public void resize(int wide, int high) {
 
   @Override
   protected void saveState() {
-    restoreWidth = pixelWidth;
-    restoreHeight = pixelHeight;
-    if (restoreWidth == 0 || restoreHeight == 0) return; // maybe still initializing...
-
     Context context = parent.getContext();
-    if (context == null || bitmap == null) return;
+    if (context == null || bitmap == null || parent.getSurface().getComponent().isService()) return;
     try {
       // Saving current width and height to avoid restoring the screen after a screen rotation
+      restoreWidth = pixelWidth;
+      restoreHeight = pixelHeight;
+
       System.out.println("============================> SAVING SCREEN FROM " + restoreWidth + " " + pixelHeight);
 
       int size = bitmap.getHeight() * bitmap.getRowBytes();

core/src/processing/android/PWallpaper.java

@@ -173,6 +173,7 @@ public void onSurfaceChanged(final SurfaceHolder holder, final int format,
     @Override
     public void onVisibilityChanged(boolean visible) {
       if (sketch != null) {
+        System.out.println("============> CHANGING WALLPAPER VISIBILITY TO " + visible);
         if (visible) {
           sketch.onResume();
         } else {

core/src/processing/android/PWatchFaceCanvas.java

@@ -47,7 +47,6 @@ public class PWatchFaceCanvas extends CanvasWatchFaceService implements AppCompo
   private DisplayMetrics metrics;
   private CanvasEngine engine;
 
-
   public void initDimensions() {
     metrics = new DisplayMetrics();
     size = new Point();

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -671,7 +671,7 @@ public void reset() {
   @Override
   public void setSize(int iwidth, int iheight) {
     // OR with prev value in case setSize() gets called twice before the renderer has the chance to resize
-    sized |= iwidth != width || iheight != height;
+    sized = iwidth != width || iheight != height;
     System.out.println("======================> RESIZING AT FRAME " + parent.frameCount + " FROM " + width + "x" + height + " to " + iwidth + "x" + iheight);
     super.setSize(iwidth, iheight);
 
@@ -5703,28 +5703,26 @@ protected void drawPixels(int[] pixBuffer, int x, int y, int w, int h) {
 
   @Override
   protected void saveState() {
-    // Saving current width and height to avoid restoring the screen after a screen rotation
-    restoreWidth = pixelWidth;
-    restoreHeight = pixelHeight;
-    if (restoreWidth == 0 || restoreHeight == 0) return; // maybe still initializing...
-
     // Queue the pixel read operation so it is performed when the surface is ready
     pgl.queueEvent(new Runnable() {
       @Override
       public void run() {
         Context context = parent.getContext();
-        if (context == null) return;
+        if (context == null || parent.getSurface().getComponent().isService()) return;
         try {
-          if (restoreWidth != pixelWidth && restoreHeight != pixelHeight) {
-            // The screen size changed between calling saveState() and the pixel read operation,
-            // so it does no longer makes sense to try saving the screen's contents.
-            restoreWidth = -1;
-            restoreHeight = -1;
-            return;
-          }
-
+//          if (restoreWidth != pixelWidth && restoreHeight != pixelHeight) {
+//            // The screen size changed between calling saveState() and the pixel read operation,
+//            // so it does no longer makes sense to try saving the screen's contents.
+//            restoreWidth = -1;
+//            restoreHeight = -1;
+//            return;
+//          }
+
+          restoreWidth = pixelWidth;
+          restoreHeight = pixelHeight;
           System.out.println("============================> SAVING SCREEN FROM " + restoreWidth + " " + pixelHeight);
 
+
           int[] restorePixels = new int[restoreWidth * restoreHeight];
           IntBuffer buf = IntBuffer.wrap(restorePixels);
           buf.position(0);