refining surface restart changes

Author: codeanticode

core/src/processing/android/PWallpaper.java

@@ -133,18 +133,24 @@ public class PEngine extends Engine {
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);
-      if (sketch == null) {
+      if (sketch == null || isPreview()) {
+        // Creating the sketch for the first time, this means that we are
+        // in preview mode
         sketch = createSketch();
         sketch.initSurface(PWallpaper.this, getSurfaceHolder());
         sketch.startSurface();
         // By default we don't get touch events, so enable them.
         setTouchEventsEnabled(true);
       } else {
-//        sketch.onPause();
+        // Sketch already exists, so we are launching the "real" wallpaper.
+        // Since the containing process is still the same, we don't want to
+        // recreate the sketch and all associated resources (renderer, etc) not
+        // only to keep resource usage/starting times low, but also because
+        // otherwise strange things might happen (e.g.: static variables in places
+        // like PConstants are zeroed when the preview instance is disposed, but
+        // still accessed by the new instance).
         sketch.resetSurface(PWallpaper.this, getSurfaceHolder());
-        sketch.frameCount = 0;
         sketch.startSurface();
-        PApplet.println("Restarting sketch", sketch.isLooping());
       }
       if (sketch != null) {
         sketch.preview = isPreview();
@@ -155,13 +161,11 @@ public void onCreate(SurfaceHolder surfaceHolder) {
     @Override
     public void onSurfaceCreated(SurfaceHolder surfaceHolder) {
       super.onSurfaceCreated(surfaceHolder);
-//      Log.d(TAG, "onSurfaceCreated()");
     }
 
     @Override
     public void onSurfaceChanged(final SurfaceHolder holder, final int format,
                                  final int width, final int height) {
-//      Log.d(TAG, "onSurfaceChanged()");
       if (sketch != null) {
         sketch.g.setSize(width, height);
       }
@@ -170,19 +174,11 @@ public void onSurfaceChanged(final SurfaceHolder holder, final int format,
 
     @Override
     public void onVisibilityChanged(boolean visible) {
-//      if (LoggerConfig.ON) {
-//        Log.d(TAG, "onVisibilityChanged(" + visible + ")");
-//      }
-//
-      if (!isPreview()) {
-        if (sketch != null) {
-          if (visible) {
-            PApplet.println("resuming sketch", sketch.frameCount);
-            sketch.onResume();
-          } else {
-            PApplet.println("pausing sketch", sketch.frameCount);
-            sketch.onPause();
-          }
+      if (!isPreview() && sketch != null) {
+        if (visible) {
+          sketch.onResume();
+        } else {
+          sketch.onPause();
         }
       }
       super.onVisibilityChanged(visible);
@@ -217,20 +213,9 @@ public void onSurfaceDestroyed(SurfaceHolder holder) {
 
     @Override
     public void onDestroy() {
-      // Called right before the engine is going away.
-//      if (LoggerConfig.ON) {
-//        Log.d(TAG, "onDestroy()");
-//      }
-//
       super.onDestroy();
-      if (sketch != null)  {
-        if (isPreview()) {
-//          PApplet.println("Pausing sketch");
-//          sketch.onPause();
-        } else {
-          PApplet.println("Destroying sketch");
-          sketch.onDestroy();
-        }
+      if (!isPreview() && sketch != null) {
+        sketch.onDestroy();
       }
     }
 

core/src/processing/core/PApplet.java

@@ -504,9 +504,6 @@ public void initSurface(LayoutInflater inflater, ViewGroup container,
 
     if (parentLayout == -1) {
       setFullScreenVisibility();
-      // Now we now the right width/height size for the renderer
-//      g.setSize(width, height); // do need this?
-      // Finalize surface initialization.
       surface.initView(width, height);
     } else {
       surface.initView(inflater, container, savedInstanceState,
@@ -524,18 +521,37 @@ public void initSurface(LayoutInflater inflater, ViewGroup container,
   }
 
   public void resetSurface(AppComponent component, SurfaceHolder holder) {
-    if (surface != null) surface.dispose();
+    parentLayout = -1;
+    resetSurface(null, null,  null, component, holder);
+  }
+
+  public void resetSurface(LayoutInflater inflater, ViewGroup container,
+                           Bundle savedInstanceState,
+                           AppComponent component, SurfaceHolder holder) {
+    if (surface != null) {
+      // Don't kill the process (activity or service) after stopping the
+      // animation thread, otherwise the app will just quit. This in particular
+      // is needed by live wallpapers (since the preview and real wallpaper are
+      // the same service process).
+      surface.stopThread(false);
+      surface.dispose();
+    }
     surface = g.createSurface(component, holder);
+
     if (parentLayout == -1) {
       setFullScreenVisibility();
-      // Now we now the right width/height size for the renderer
-//      g.setSize(width, height); // do need this?
-      // Finalize surface initialization.
       surface.initView(width, height);
     } else {
-//      surface.initView(inflater, container, savedInstanceState,
-//                       fullScreen, width, height);
+      surface.initView(inflater, container, savedInstanceState,
+                       fullScreen, width, height);
     }
+
+    // Reset frame count to start from setup() again
+    frameCount = 0;
+
+    finished = false;
+    looping = true;
+    redraw = true;
   }
 
 

core/src/processing/core/PSurface.java

@@ -87,6 +87,8 @@ public void initView(LayoutInflater inflater, ViewGroup container,
 
   public boolean stopThread();
 
+  public boolean stopThread(boolean killProc);
+
   public boolean isStopped();
 
   public void finish();

core/src/processing/core/PSurfaceNone.java

@@ -66,6 +66,8 @@ public class PSurfaceNone implements PSurface, PConstants {
   protected float frameRateTarget = 60;
   protected long frameRatePeriod = 1000000000L / 60L;
 
+  protected boolean killProcAfterStop = true;
+
   @Override
   public Context getContext() {
     if (component.getKind() == AppComponent.FRAGMENT) {
@@ -299,7 +301,7 @@ public void setSystemUiVisibility(int visibility) {
 
   @Override
   public void finish() {
-    if (sketch == null || component == null) return;
+    if (component == null) return;
 
     if (component.getKind() == AppComponent.FRAGMENT) {
       activity.finish();
@@ -349,6 +351,12 @@ public void resumeThread() {
 
   @Override
   public boolean stopThread() {
+    return stopThread(true);
+  }
+
+  @Override
+  public boolean stopThread(boolean killProc) {
+    killProcAfterStop = killProc;
     if (thread == null) {
       return false;
     }
@@ -409,7 +417,8 @@ public void run() {  // not good to make this synchronized, locks things up
       // un-pause the sketch and get rolling
       sketch.start();
 
-      while ((Thread.currentThread() == thread) && (sketch != null && !sketch.finished)) {
+      while ((Thread.currentThread() == thread) &&
+             (sketch != null && !sketch.finished)) {
         checkPause();
         callDraw();
 
@@ -444,8 +453,7 @@ public void run() {  // not good to make this synchronized, locks things up
         beforeTime = System.nanoTime();
       }
 
-//      PApplet.println("Sketch is finished", sketch.frameCount);
-      finish();
+      if (killProcAfterStop) finish();
     }
   }
 }

core/src/processing/opengl/PSurfaceGLES.java

@@ -80,7 +80,6 @@ public PSurfaceGLES(PGraphics graphics, AppComponent component, SurfaceHolder ho
   public void dispose() {
     super.dispose();
     if (glsurf != null) {
-      PApplet.println("dispose surface");
       glsurf.dispose();
       glsurf = null;
     }
@@ -152,8 +151,6 @@ public SurfaceHolder getHolder() {
     public void dispose() {
       super.destroyDrawingCache();
       super.onDetachedFromWindow();
-//       don't think i want to call stop() from here, since it might be swapping renderers
-//            stop();
     }