Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
This reverts commit 39b7353acacf08a3c0204a9ec122fff420e53310.
Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0
diff --git a/api/current.txt b/api/current.txt
index 759d571..9edc6d3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9708,13 +9708,9 @@
method public int save();
method public int save(int);
method public int saveLayer(android.graphics.RectF, android.graphics.Paint, int);
- method public int saveLayer(android.graphics.RectF, android.graphics.Paint);
method public int saveLayer(float, float, float, float, android.graphics.Paint, int);
- method public int saveLayer(float, float, float, float, android.graphics.Paint);
method public int saveLayerAlpha(android.graphics.RectF, int, int);
- method public int saveLayerAlpha(android.graphics.RectF, int);
method public int saveLayerAlpha(float, float, float, float, int, int);
- method public int saveLayerAlpha(float, float, float, float, int);
method public void scale(float, float);
method public final void scale(float, float, float, float);
method public void setBitmap(android.graphics.Bitmap);
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 9e767d3..2b72b93 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -21,6 +21,8 @@
import android.text.SpannedString;
import android.text.TextUtils;
+import javax.microedition.khronos.opengles.GL;
+
/**
* The Canvas class holds the "draw" calls. To draw something, you need
* 4 basic components: A Bitmap to hold the pixels, a Canvas to host
@@ -166,6 +168,29 @@
}
/**
+ * Gets the native canvas pointer.
+ *
+ * @return The native pointer.
+ *
+ * @hide
+ */
+ public long getNativeCanvas() {
+ return mNativeCanvas;
+ }
+
+ /**
+ * Returns null.
+ *
+ * @deprecated This method is not supported and should not be invoked.
+ *
+ * @hide
+ */
+ @Deprecated
+ protected GL getGL() {
+ return null;
+ }
+
+ /**
* Indicates whether this Canvas uses hardware acceleration.
*
* Note that this method does not define what type of hardware acceleration
@@ -364,14 +389,7 @@
paint != null ? paint.mNativePaint : 0,
saveFlags);
}
-
- /**
- * Convenience for saveLayer(bounds, paint, {@link #ALL_SAVE_FLAG})
- */
- public int saveLayer(RectF bounds, Paint paint) {
- return saveLayer(bounds, paint, ALL_SAVE_FLAG);
- }
-
+
/**
* Helper version of saveLayer() that takes 4 values rather than a RectF.
*/
@@ -383,13 +401,6 @@
}
/**
- * Convenience for saveLayer(left, top, right, bottom, paint, {@link #ALL_SAVE_FLAG})
- */
- public int saveLayer(float left, float top, float right, float bottom, Paint paint) {
- return saveLayer(left, top, right, bottom, paint, ALL_SAVE_FLAG);
- }
-
- /**
* This behaves the same as save(), but in addition it allocates an
* offscreen bitmap. All drawing calls are directed there, and only when
* the balancing call to restore() is made is that offscreen transfered to
@@ -409,14 +420,7 @@
alpha = Math.min(255, Math.max(0, alpha));
return native_saveLayerAlpha(mNativeCanvas, bounds, alpha, saveFlags);
}
-
- /**
- * Convenience for saveLayerAlpha(bounds, alpha, {@link #ALL_SAVE_FLAG})
- */
- public int saveLayerAlpha(RectF bounds, int alpha) {
- return saveLayerAlpha(bounds, alpha, ALL_SAVE_FLAG);
- }
-
+
/**
* Helper for saveLayerAlpha() that takes 4 values instead of a RectF.
*/
@@ -427,13 +431,6 @@
}
/**
- * Helper for saveLayerAlpha(left, top, right, bottom, alpha, {@link #ALL_SAVE_FLAG})
- */
- public int saveLayerAlpha(float left, float top, float right, float bottom, int alpha) {
- return saveLayerAlpha(left, top, right, bottom, alpha, ALL_SAVE_FLAG);
- }
-
- /**
* This call balances a previous call to save(), and is used to remove all
* modifications to the matrix/clip state since the last save call. It is
* an error to call restore() more times than save() was called.