updates/fixes to activty lifecyle

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -23,6 +23,7 @@
 
 package processing.a2d;
 
+import java.nio.ByteBuffer;
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
 
@@ -38,12 +39,15 @@
 import processing.core.PShapeSVG;
 import processing.core.PSurface;
 import processing.data.XML;
+
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.MemoryInfo;
 import android.graphics.*;
 import android.graphics.Bitmap.Config;
 import android.graphics.Paint.Style;
+import android.os.Build;
 import android.view.SurfaceHolder;
 
 
@@ -110,6 +114,17 @@ public class PGraphicsAndroid2D extends PGraphics {
    */
   protected boolean sized;
 
+  /**
+   * Marks when some changes have occurred, to the surface view.
+   */
+  protected boolean changed;
+
+  //////////////////////////////////////////////////////////////
+
+  /** To save the surface contents before the activity is taken to the background. */
+  private int restoreCount;
+  private ByteBuffer restoreBitmap;
+
   //////////////////////////////////////////////////////////////
 
   // INTERNAL
@@ -140,11 +155,16 @@ public PGraphicsAndroid2D() {
 
   //public void setPath(String path)
 
+  @Override
+  public void surfaceChanged() {
+    changed = true;
+  }
+
 
   @Override
   public void setSize(int iwidth, int iheight) {
+    sized = iwidth != width || iheight != height;
     super.setSize(iwidth, iheight);
-    sized = true;
   }
 
 
@@ -180,34 +200,29 @@ public void requestDraw() {
 //parent.handleDraw();
 //  }
 
-
+  @SuppressLint("NewApi")
   protected Canvas checkCanvas() {
     if ((canvas == null || sized) && (useBitmap || !primaryGraphics)) {
-      if (bitmap == null || bitmap.getWidth() * bitmap.getHeight() < width * height) {
+      if (bitmap == null || bitmap.getWidth() * bitmap.getHeight() < width * height ||
+          Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
         if (bitmap != null) bitmap.recycle();
         bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
       } else {
+        // reconfigure is only available in API level 19 or higher.
         bitmap.reconfigure(width, height, bitmap.getConfig());
       }
       canvas = new Canvas(bitmap);
       sized = false;
     }
+    restoreSurface();
     return canvas;
   }
 
 
   @Override
   public void beginDraw() {
-    canvas = checkCanvas();
 
-//    if (primaryGraphics) {
-//      canvas = parent.getSurfaceHolder().lockCanvas(null);
-//      if (canvas == null) {
-//        throw new RuntimeException("canvas is still null");
-//      }
-//    } else {
-//      throw new RuntimeException("not primary surface");
-//    }
+    canvas = checkCanvas();
 
     checkSettings();
 
@@ -222,16 +237,6 @@ public void beginDraw() {
   public void endDraw() {
     if (bitmap == null) return;
 
-    // hm, mark pixels as changed, because this will instantly do a full
-    // copy of all the pixels to the surface.. so that's kind of a mess.
-    //updatePixels();
-
-//    if (primaryGraphics) {
-//      if (canvas != null) {
-//        parent.getSurfaceHolder().unlockCanvasAndPost(canvas);
-//      }
-//    }
-
     if (primaryGraphics) {
       SurfaceHolder holder = parent.getSurface().getSurfaceHolder();
       if (holder != null) {
@@ -2064,6 +2069,40 @@ public void resize(int wide, int high) {
   }
 
 
+  @Override
+  protected void saveState() {
+    if (bitmap != null) {
+      int size = bitmap.getHeight() * bitmap.getRowBytes();
+      restoreBitmap = ByteBuffer.allocate(size);
+      bitmap.copyPixelsToBuffer(restoreBitmap);
+    }
+  }
+
+
+  @Override
+  protected void restoreState() {
+  }
+
+
+  @Override
+  protected void restoreSurface() {
+    if (changed) {
+      changed = false;
+      if (restoreBitmap != null) {
+        // Set the counter to 1 so the restore bitmap is drawn in the next frame.
+        restoreCount = 1;
+      }
+    } else if (restoreCount > 0) {
+      restoreCount--;
+      if (restoreCount == 0) {
+        // Draw and dispose bitmap
+        restoreBitmap.rewind();
+        bitmap.copyPixelsFromBuffer(restoreBitmap);
+        restoreBitmap = null;
+      }
+    }
+  }
+
 
   //////////////////////////////////////////////////////////////
 

core/src/processing/a2d/PSurfaceAndroid2D.java

@@ -123,12 +123,13 @@ public void surfaceChanged(SurfaceHolder holder, int format, int iwidth, int ihe
         System.out.println("SketchSurfaceView.surfaceChanged() " + iwidth + " " + iheight);
       }
 
+      sketch.surfaceChanged();
+      graphics.surfaceChanged();
+
       sketch.setSize(iwidth, iheight);
       graphics.setSize(sketch.sketchWidth(), sketch.sketchHeight());
-      sketch.surfaceChanged();
     }
 
-
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
       super.onWindowFocusChanged(hasFocus);

core/src/processing/core/PApplet.java

@@ -65,7 +65,7 @@
 public class PApplet extends Object implements ActivityAPI, PConstants {
 
 //  static final public boolean DEBUG = true;
-  static final public boolean DEBUG = false;
+  static final public boolean DEBUG = true;
 
   // Convenience public constant holding the SDK version, akin to platform in Java mode
   static final public int SDK = Build.VERSION.SDK_INT;
@@ -532,13 +532,13 @@ public void onResume() {
     // TODO need to bring back app state here!
     // At least we restore the current style.
     if (savedStyle != null && g != null) {
+      g.restoreState();
       g.style(savedStyle);
       savedStyle = null;
     }
 
     handleMethods("resume");
 
-    surface.resumeThread();
     if (0 < frameCount) {
       // Don't call resume() when the app is starting and setup() has not been
       // called yet
@@ -549,21 +549,25 @@ public void onResume() {
       // https://developer.android.com/guide/components/activities/activity-lifecycle.html
       resume();
     }
+
+    surface.resumeThread();
   }
 
 
   public void onPause() {
+    surface.pauseThread();
+
     // TODO need to save all application state here!
     // At least we save the current style (once we had at least drawn one
     // frame, otherwise we might be saving a "null" style with all zeroes).
     if (g != null && 0 < frameCount) {
       savedStyle = new PStyle();
       g.getStyle(savedStyle);
+      g.saveState();
     }
 
     handleMethods("pause");
 
-    surface.pauseThread();
     pause();  // handler for others to write
   }
 
@@ -844,7 +848,6 @@ public void surfaceKeyUp(int code, android.view.KeyEvent event) {
    * PAppletGL needs to have a usable screen before getting things rolling.
    */
   public void start() {
-    surface.resumeThread();
   }
 
 
@@ -857,11 +860,6 @@ public void start() {
    * or when moving between web pages), and it's not always called.
    */
   public void stop() {
-    // this used to shut down the sketch, but that code has
-    // been moved to dispose()
-    surface.pauseThread();
-
-    //TODO listeners
   }
 
 
@@ -1322,30 +1320,27 @@ public void setExternal(boolean external) {
 //. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
- public void smooth() {
+  public void smooth() {
    smooth(1);
  }
 
 
- public void smooth(int level) {
-   if (insideSettings) {
-     this.smooth = level;
-
-   } else if (this.smooth != level) {
-     smoothWarning("smooth");
-   }
- }
-
-
- public void noSmooth() {
-   if (insideSettings) {
-     this.smooth = 0;
+  public void smooth(int level) {
+    if (insideSettings) {
+      this.smooth = level;
+    } else if (this.smooth != level) {
+      smoothWarning("smooth");
+    }
+  }
 
-   } else if (this.smooth != 0) {
-     smoothWarning("noSmooth");
-   }
- }
 
+  public void noSmooth() {
+    if (insideSettings) {
+      this.smooth = 0;
+    } else if (this.smooth != 0) {
+      smoothWarning("noSmooth");
+    }
+  }
 
  private void smoothWarning(String method) {
    // When running from the PDE, say setup(), otherwise say settings()
@@ -1357,7 +1352,11 @@ private void smoothWarning(String method) {
  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
- public void orientation(int which) {
+  public PGraphics getGraphics() {
+    return g;
+  }
+
+  public void orientation(int which) {
    surface.setOrientation(which);
  }
 
@@ -1756,11 +1755,6 @@ public void handleDraw() {
       return;
     }
 
-//    if (surfaceChanged) {
-//      surfaceChanged = false;
-//      surfaceReady = true;
-//    }
-
     if (!looping && !redraw) return;
 
     if (insideDraw) {
@@ -1839,12 +1833,6 @@ public void handleDraw() {
   }
 
 
-  /** Not official API, not guaranteed to work in the future. */
-//  public boolean canDraw() {
-//    return g != null && surfaceReady && !paused && (looping || redraw);
-//  }
-
-
   //////////////////////////////////////////////////////////////
 
 

core/src/processing/core/PGraphics.java

@@ -687,6 +687,9 @@ public void setFrameRate(float framerate) {  // ignore
   }
 
 
+  public void surfaceChanged() {  // ignore
+   }
+
   /**
    * The final step in setting up a renderer, set its size of this renderer.
    * This was formerly handled by the constructor, but instead it's been broken
@@ -903,7 +906,7 @@ protected void defaultSettings() {  // ignore
    * size(), which is safely called from inside beginDraw(). And it cannot be
    * called before defaultSettings(), so we should be safe.
    */
-  protected void reapplySettings() {
+  protected void reapplySettings() {  // ignore
 //    System.out.println("attempting reapplySettings()");
     if (!settingsInited) return;  // if this is the initial setup, no need to reapply
 
@@ -962,6 +965,18 @@ protected void reapplySettings() {
   }
 
 
+  protected void saveState() {  // ignore
+
+  }
+
+  protected void restoreState() {  // ignore
+
+  }
+
+  protected void restoreSurface() { // ignore
+
+  }
+
   //////////////////////////////////////////////////////////////
 
   // HINTS

core/src/processing/core/PSurfaceNone.java

@@ -57,7 +57,7 @@
 
 /**
  * Base surface for Android2D and OpenGL renderers.
- * It includes the standard rendering loop.
+ * It includes the implementation of the rendering thread.
  */
 public class PSurfaceNone implements PSurface, PConstants {
   protected PApplet sketch;
@@ -375,7 +375,6 @@ public void finish() {
 //    }
   }
 
-
   ///////////////////////////////////////////////////////////
 
   // Thread handling
@@ -453,8 +452,9 @@ public void setFrameRate(float fps) {
 
 
   protected void checkPause() {
-    if (paused) {
+//    if (paused) {
       synchronized (pauseObject) {
+        while (paused) {
         try {
           pauseObject.wait();
         } catch (InterruptedException e) {