use the variable names from wallpapers and watch faces verbatim

And add a few convenience functions

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -232,7 +232,7 @@ public void endDraw() {
 //    }
 
     if (primaryGraphics) {
-      SurfaceHolder holder = parent.surface.getSurfaceHolder();
+      SurfaceHolder holder = parent.getSurface().getSurfaceHolder();
       if (holder != null) {
         Canvas screen = null;
         try {

core/src/processing/android/PFragment.java

@@ -129,7 +129,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                            Bundle savedInstanceState) {
     if (sketch != null) {
       sketch.initSurface(inflater, container, savedInstanceState, this, null);
-      return sketch.surface.getRootView();
+      return sketch.getSurface().getRootView();
     } else {
       return null;
     }

core/src/processing/android/PWallpaper.java

@@ -143,6 +143,8 @@ public void onDestroy() {
   public class WallpaperEngine extends Engine implements ServiceEngine {
     private PApplet sketch;
     private float xOffset, xOffsetStep;
+    private float yOffset, yOffsetStep;
+    private int xPixelOffset, yPixelOffset;
 
 
     @Override
@@ -212,7 +214,11 @@ public void onOffsetsChanged(float xOffset, float yOffset,
 
       if (sketch != null) {
         this.xOffset = xOffset;
+        this.yOffset = yOffset;
         this.xOffsetStep = xOffsetStep;
+        this.yOffsetStep = yOffsetStep;
+        this.xPixelOffset = xPixelOffset;
+        this.yPixelOffset = yPixelOffset;
 
         sketch.homeScreenOffset = xOffset;
         if (0 < xOffsetStep) {
@@ -245,13 +251,43 @@ public void onDestroy() {
 
 
     @Override
-    public float homeScreenOffset() {
+    public float getXOffset() {
       return xOffset;
     }
 
 
     @Override
-    public int homeScreenCount() {
+    public float getYOffset() {
+      return yOffset;
+    }
+
+
+    @Override
+    public float getXOffsetStep() {
+      return xOffsetStep;
+    }
+
+
+    @Override
+    public float getYOffsetStep() {
+      return yOffsetStep;
+    }
+
+
+    @Override
+    public int getXPixelOffset() {
+      return xPixelOffset;
+    }
+
+
+    @Override
+    public int getYPixelOffset() {
+      return yPixelOffset;
+    }
+
+
+    @Override
+    public int getHomeScreenCount() {
       if (0 < xOffsetStep) {
         return (int)(1 + 1 / xOffsetStep);
       } else {
@@ -261,7 +297,13 @@ public int homeScreenCount() {
 
 
     @Override
-    public boolean ambientMode() {
+    public boolean isInAmbientMode() {
+      return false;
+    }
+
+
+    @Override
+    public boolean isInInteractiveMode() {
       return false;
     }
 
@@ -273,37 +315,43 @@ public boolean isRound() {
 
 
     @Override
-    public int insetLeft() {
+    public boolean isSquare() {
+      return false;
+    }
+
+
+    @Override
+    public int getInsetLeft() {
       return 0;
     }
 
 
     @Override
-    public int insetRight() {
+    public int getInsetRight() {
       return 0;
     }
 
 
     @Override
-    public int insetTop() {
+    public int getInsetTop() {
       return 0;
     }
 
 
     @Override
-    public int insetBottom() {
+    public int getInsetBottom() {
       return 0;
     }
 
 
     @Override
-    public boolean lowBitAmbient() {
+    public boolean useLowBitAmbient() {
       return false;
     }
 
 
     @Override
-    public boolean burnInProtection() {
+    public boolean requireBurnInProtection() {
       return false;
     }
   }

core/src/processing/android/PWatchFaceCanvas.java

@@ -379,20 +379,50 @@ public void onDestroy() {
 
 
     @Override
-    public float homeScreenOffset() {
+    public float getXOffset() {
       return 0;
     }
 
 
     @Override
-    public int homeScreenCount() {
+    public float getYOffset() {
       return 0;
     }
 
 
     @Override
-    public boolean ambientMode() {
-      return isInAmbientMode();
+    public float getXOffsetStep() {
+      return 0;
+    }
+
+
+    @Override
+    public float getYOffsetStep() {
+      return 0;
+    }
+
+
+    @Override
+    public int getXPixelOffset() {
+      return 0;
+    }
+
+
+    @Override
+    public int getYPixelOffset() {
+      return 0;
+    }
+
+
+    @Override
+    public int getHomeScreenCount() {
+      return 0;
+    }
+
+
+    @Override
+    public boolean isInInteractiveMode() {
+      return !isInAmbientMode();
     }
 
 
@@ -403,37 +433,43 @@ public boolean isRound() {
 
 
     @Override
-    public int insetLeft() {
+    public boolean isSquare() {
+      return !isRound;
+    }
+
+
+    @Override
+    public int getInsetLeft() {
       return insetLeft;
     }
 
 
     @Override
-    public int insetRight() {
+    public int getInsetRight() {
       return insetRight;
     }
 
 
     @Override
-    public int insetTop() {
+    public int getInsetTop() {
       return insetTop;
     }
 
 
     @Override
-    public int insetBottom() {
+    public int getInsetBottom() {
       return insetBottom;
     }
 
 
     @Override
-    public boolean lowBitAmbient() {
+    public boolean useLowBitAmbient() {
       return lowBitAmbient;
     }
 
 
     @Override
-    public boolean burnInProtection() {
+    public boolean requireBurnInProtection() {
       return burnInProtection;
     }
   }

core/src/processing/android/PWatchFaceGLES.java

@@ -374,20 +374,50 @@ public void onDestroy() {
 
 
     @Override
-    public float homeScreenOffset() {
+    public float getXOffset() {
       return 0;
     }
 
 
     @Override
-    public int homeScreenCount() {
+    public float getYOffset() {
       return 0;
     }
 
 
     @Override
-    public boolean ambientMode() {
-      return isInAmbientMode();
+    public float getXOffsetStep() {
+      return 0;
+    }
+
+
+    @Override
+    public float getYOffsetStep() {
+      return 0;
+    }
+
+
+    @Override
+    public int getXPixelOffset() {
+      return 0;
+    }
+
+
+    @Override
+    public int getYPixelOffset() {
+      return 0;
+    }
+
+
+    @Override
+    public int getHomeScreenCount() {
+      return 0;
+    }
+
+
+    @Override
+    public boolean isInInteractiveMode() {
+      return !isInAmbientMode();
     }
 
 
@@ -398,37 +428,43 @@ public boolean isRound() {
 
 
     @Override
-    public int insetLeft() {
+    public boolean isSquare() {
+      return !isRound;
+    }
+
+
+    @Override
+    public int getInsetLeft() {
       return insetLeft;
     }
 
 
     @Override
-    public int insetRight() {
+    public int getInsetRight() {
       return insetRight;
     }
 
 
     @Override
-    public int insetTop() {
+    public int getInsetTop() {
       return insetTop;
     }
 
 
     @Override
-    public int insetBottom() {
+    public int getInsetBottom() {
       return insetBottom;
     }
 
 
     @Override
-    public boolean lowBitAmbient() {
+    public boolean useLowBitAmbient() {
       return lowBitAmbient;
     }
 
 
     @Override
-    public boolean burnInProtection() {
+    public boolean requireBurnInProtection() {
       return burnInProtection;
     }
   }

core/src/processing/android/ServiceEngine.java

@@ -27,18 +27,25 @@
 public interface ServiceEngine extends PConstants {
   // Live wallpapers
   public boolean isPreview();
-  public float homeScreenOffset();
-  public int homeScreenCount();
+  public float getXOffset();
+  public float getYOffset();
+  public float getXOffsetStep();
+  public float getYOffsetStep();
+  public int getXPixelOffset();
+  public int getYPixelOffset();
+  public int getHomeScreenCount();
 
   // Watch faces
-  public boolean ambientMode();
+  public boolean isInAmbientMode();
+  public boolean isInInteractiveMode();
   public boolean isRound();
+  public boolean isSquare();
 
-  public int insetLeft();
-  public int insetRight();
-  public int insetTop();
-  public int insetBottom();
+  public int getInsetLeft();
+  public int getInsetRight();
+  public int getInsetTop();
+  public int getInsetBottom();
 
-  public boolean lowBitAmbient();
-  public boolean burnInProtection();
+  public boolean useLowBitAmbient();
+  public boolean requireBurnInProtection();
 }