Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"" (ddd4a9b9) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -9735,13 +9735,9 @@ package android.graphics {
		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);

graphics/java/android/graphics/Canvas.java

+27 −30

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ import android.text.SpannableString;
		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
		@@ -165,6 +167,29 @@ public class Canvas {
		finalizer(oldCanvas);
		}

		/**
		* 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.
		*
		@@ -365,13 +390,6 @@ public class Canvas {
		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.
		*/
		@@ -382,13 +400,6 @@ public class Canvas {
		saveFlags);
		}

		/**
		* 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
		@@ -410,13 +421,6 @@ public class Canvas {
		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.
		*/
		@@ -426,13 +430,6 @@ public class Canvas {
		alpha, saveFlags);
		}

		/**
		* 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