watch faces with Android2D renderer are working

Author: codeanticode

core/src/processing/android/PWatchFaceCanvas.java

@@ -4,12 +4,17 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.support.wearable.watchface.CanvasWatchFaceService;
+import android.support.wearable.watchface.WatchFaceService;
 import android.support.wearable.watchface.WatchFaceStyle;
 import android.util.DisplayMetrics;
+import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.WindowManager;
 import processing.core.PApplet;
+import android.graphics.Bitmap;
 import processing.core.PGraphicsAndroid2D;
+import processing.event.MouseEvent;
+
 
 public class PWatchFaceCanvas extends CanvasWatchFaceService implements AppComponent {
   private DisplayMetrics metrics;
@@ -69,6 +74,7 @@ public void onCreate(SurfaceHolder surfaceHolder) {
               .setAcceptsTapEvents(true)
               .build());
       if (sketch != null) {
+        PGraphicsAndroid2D.useBitmap = false;
         sketch.initSurface(PWatchFaceCanvas.this, null);
         sketch.start();
       }
@@ -83,7 +89,7 @@ private void invalidateIfNecessary() {
     @Override
     public void onAmbientModeChanged(boolean inAmbientMode) {
       super.onAmbientModeChanged(inAmbientMode);
-//      invalidate();
+      invalidateIfNecessary();
       // call new event handlers in sketch (?)
     }
 
@@ -96,7 +102,6 @@ public void onVisibilityChanged(boolean visible) {
       } else {
         sketch.onPause();
       }
-//      startTimerIfNecessary();
     }
 
 
@@ -114,12 +119,86 @@ public void onTimeTick() {
 
     @Override
     public void onDraw(Canvas canvas, Rect bounds) {
-        super.onDraw(canvas, bounds);
-        PGraphicsAndroid2D g2 = (PGraphicsAndroid2D)sketch.g;
-        g2.canvas = canvas;
-        sketch.handleDraw();
+      super.onDraw(canvas, bounds);
+      PGraphicsAndroid2D g2 = (PGraphicsAndroid2D)sketch.g;
+      g2.canvas = canvas;
+      sketch.handleDraw();
+    }
+
+    @Override
+    public void onTapCommand(
+            @TapType int tapType, int x, int y, long eventTime) {
+      switch (tapType) {
+        case WatchFaceService.TAP_TYPE_TOUCH:
+          // The system sends the first command, TAP_TYPE_TOUCH, when the user initially touches the screen
+//          if (withinTapRegion(x, y)) {
+//            // Provide visual feedback of touch event
+//            startTapHighlight(x, y, eventTime);
+//          }
+          sketch.postEvent(new MouseEvent(null, eventTime,
+                  MouseEvent.PRESS, 0,
+                  x, y, LEFT, 1));
+          invalidate();
+          break;
+
+
+        case WatchFaceService.TAP_TYPE_TAP:
+          // Before sending the next command, the system judges whether the contact is a single tap,
+          // which is the only gesture allowed. If the user immediately lifts their finger,
+          // the system determines that a single tap took place, and forwards a TAP_TYPE_TAP event
+          sketch.postEvent(new MouseEvent(null, eventTime,
+                  MouseEvent.RELEASE, 0,
+                  x, y, LEFT, 1));
+
+//          hideTapHighlight();
+//          if (withinTapRegion(x, y)) {
+//            // Implement the tap action
+//            // (e.g. show detailed step count)
+//            onWatchFaceTap();
+//          }
+
+
+          invalidate();
+          break;
+
+        case WatchFaceService.TAP_TYPE_TOUCH_CANCEL:
+          // If the user does not immediately lift their finger, the system forwards a
+          // TAP_TYPE_TOUCH_CANCEL event. Once the user has triggered a TAP_TYPE_TOUCH_CANCEL event,
+          // they cannot trigger a TAP_TYPE_TAP event until they make a new contact with the screen.
+          //hideTapHighlight();
+
+          // New type of event...
+          sketch.postEvent(new MouseEvent(null, eventTime,
+                  MouseEvent.RELEASE, 0,
+                  x, y, LEFT, 1));
+          invalidate();
+          break;
+
+        default:
+          super.onTapCommand(tapType, x, y, eventTime);
+          break;
+      }
+    }
 
-//        watchFace.draw(canvas, bounds);
+
+    @Override
+    public void onTouchEvent(MotionEvent event) {
+      PApplet.println("touch even:" + event.toString());
+      sketch.surfaceTouchEvent(event);
+      super.onTouchEvent(event);
     }
+
+    @Override
+    public void onDestroy() {
+      super.onDestroy();
+      sketch.onDestroy();
+    }
+  }
+
+
+  @Override
+  public void onDestroy() {
+    sketch.onDestroy();
+    super.onDestroy();
   }
 }

core/src/processing/android/PWatchFaceGLES.java

@@ -103,7 +103,7 @@ public void onGlSurfaceCreated(int width, int height) {
     @Override
     public void onAmbientModeChanged(boolean inAmbientMode) {
       super.onAmbientModeChanged(inAmbientMode);
-//      invalidate();
+      invalidateIfNecessary();
       // call new event handlers in sketch (?)
     }
 
@@ -116,7 +116,6 @@ public void onVisibilityChanged(boolean visible) {
       } else {
         sketch.onPause();
       }
-//      startTimerIfNecessary();
     }
 
 
@@ -135,20 +134,11 @@ public void onTimeTick() {
     @Override
     public void onDraw() {
       super.onDraw();
-
-      PApplet.println("Calling handleDraw: " + sketch.width + " " + sketch.height);
+//      PApplet.println("Calling handleDraw: " + sketch.width + " " + sketch.height);
       sketch.handleDraw();
     }
 
 
-    @Override
-    public void onTouchEvent(MotionEvent event) {
-      PApplet.println("touch even:" + event.toString());
-      sketch.surfaceTouchEvent(event);
-      super.onTouchEvent(event);
-    }
-
-
     @Override
     public void onTapCommand(
             @TapType int tapType, int x, int y, long eventTime) {
@@ -204,6 +194,14 @@ public void onTapCommand(
       }
     }
 
+
+    @Override
+    public void onTouchEvent(MotionEvent event) {
+      PApplet.println("touch even:" + event.toString());
+      sketch.surfaceTouchEvent(event);
+      super.onTouchEvent(event);
+    }
+
     @Override
     public void onDestroy() {
       super.onDestroy();

core/src/processing/core/PApplet.java

@@ -605,8 +605,13 @@ public void settings() {
   // TODO this is only used by A2D, when finishing up a draw. but if the
   // surfaceview has changed, then it might belong to an a3d surfaceview. hrm.
   public SurfaceHolder getSurfaceHolder() {
-    return surface.getSurfaceView().getHolder();
-//    return surfaceHolder;
+    SurfaceView view = surface.getSurfaceView();
+    if (view == null) {
+      // Watch faces don't have a surface view associated to them.
+      return null;
+    } else {
+      return view.getHolder();
+    }
   }
 
 

core/src/processing/core/PGraphicsAndroid2D.java

@@ -42,6 +42,7 @@
  * with the original (desktop) version of Processing.
  */
 public class PGraphicsAndroid2D extends PGraphics {
+  static public boolean useBitmap = true;
 
   public Canvas canvas;  // like g2 for PGraphicsJava2D
 
@@ -140,9 +141,11 @@ public void setSize(int iwidth, int iheight) {  // ignore
 
   @Override
   protected void allocate() {
-    if (bitmap != null) bitmap.recycle();
-    bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
-    canvas = new Canvas(bitmap);
+    if (useBitmap) {
+      if (bitmap != null) bitmap.recycle();
+      bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
+      canvas = new Canvas(bitmap);
+    }
 //    image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
 //    canvas = (Graphics2D) image.getGraphics();
   }
@@ -203,6 +206,8 @@ public void beginDraw() {
 
   @Override
   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();
@@ -214,15 +219,18 @@ public void endDraw() {
 //    }
 
     if (primaryGraphics) {
-      Canvas screen = null;
-      try {
-        screen = parent.getSurfaceHolder().lockCanvas(null);
-        if (screen != null) {
-          screen.drawBitmap(bitmap, new Matrix(), null);
-        }
-      } finally {
-        if (screen != null) {
-          parent.getSurfaceHolder().unlockCanvasAndPost(screen);
+      SurfaceHolder holder = parent.getSurfaceHolder();
+      if (holder != null) {
+        Canvas screen = null;
+        try {
+          screen = holder.lockCanvas(null);
+          if (screen != null) {
+            screen.drawBitmap(bitmap, new Matrix(), null);
+          }
+        } finally {
+          if (screen != null) {
+            parent.getSurfaceHolder().unlockCanvasAndPost(screen);
+          }
         }
       }
     } else {
@@ -1938,6 +1946,8 @@ public void endRaw() {
 
   @Override
   public void loadPixels() {
+    if (bitmap == null) return;
+
     if ((pixels == null) || (pixels.length != width * height)) {
       pixels = new int[width * height];
     }
@@ -1955,6 +1965,8 @@ public void loadPixels() {
    */
   @Override
   public void updatePixels() {
+    if (bitmap == null) return;
+
 //    WritableRaster raster = ((BufferedImage) image).getRaster();
 //    raster.setDataElements(0, 0, width, height, pixels);
     bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
@@ -1995,7 +2007,7 @@ public void resize(int wide, int high) {
 
   @Override
   public int get(int x, int y) {
-    if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) return 0;
+    if ((bitmap == null) || (x < 0) || (y < 0) || (x >= width) || (y >= height)) return 0;
 //    WritableRaster raster = ((BufferedImage) image).getRaster();
 //    raster.getDataElements(x, y, getset);
 //    return getset[0];
@@ -2030,7 +2042,7 @@ public PImage get() {
 
   @Override
   public void set(int x, int y, int argb) {
-    if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) return;
+    if ((bitmap == null) || (x < 0) || (y < 0) || (x >= width) || (y >= height)) return;
 //    getset[0] = argb;
 //    WritableRaster raster = ((BufferedImage) image).getRaster();
 //    raster.setDataElements(x, y, getset);
@@ -2163,6 +2175,8 @@ public void mask(PImage alpha) {
   @Override
   public void copy(int sx, int sy, int sw, int sh,
                    int dx, int dy, int dw, int dh) {
+    if (bitmap == null) return;
+
 //    Bitmap bitsy = Bitmap.createBitmap(image, sx, sy, sw, sh);
 //    rect.set(dx, dy, dx + dw, dy + dh);
 //    canvas.drawBitmap(bitsy,

core/src/processing/opengl/PSurfaceGLES.java

@@ -282,7 +282,7 @@ public void dispose() {
   private final Handler handler = new Handler();
   private final Runnable drawRunnable = new Runnable() {
     public void run() {
-      if (sketch != null) {
+      if (surface != null) {
         surface.requestRender();
       }
       scheduleNextDraw();
@@ -315,25 +315,21 @@ private void requestNextDraw() {
 
 
   public void startThread() {
-    if (component.getKind() == AppComponent.WATCHFACE_GLES) return;
     requestNextDraw();
   }
 
 
   public void pauseThread() {
-    if (component.getKind() == AppComponent.WATCHFACE_GLES) return;
     pauseNextDraw();
   }
 
 
   public void resumeThread() {
-    if (component.getKind() == AppComponent.WATCHFACE_GLES) return;
     scheduleNextDraw();
   }
 
 
   public boolean stopThread() {
-    if (component.getKind() == AppComponent.WATCHFACE_GLES) return true;
     pauseNextDraw();
     return true;
   }

src/processing/mode/android/AndroidBuild.java

@@ -50,6 +50,8 @@ class AndroidBuild extends JavaBuild {
   static public final int WATCHFACE = 2;
   static public final int CARDBOARD = 3;
 
+  // TODO: make package parameter in the config file, as well as the SDK version
+  // to download (latest, specific number)
   //  static final String basePackage = "changethispackage.beforesubmitting.tothemarket";
   static final String basePackage = "processing.test";
   static public final int min_sdk_fragment = 14; // Ice Cream Sandwich