Merge "Tweak RenderNode final/constructor API" (a87656a7) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -14625,9 +14625,9 @@ package android.graphics {
		method public final boolean next(android.graphics.Rect);
		}

		public class RenderNode {
		public final class RenderNode {
		ctor public RenderNode(java.lang.String);
		method public int computeApproximateMemoryUsage();
		method public static android.graphics.RenderNode create(java.lang.String);
		method public void discardDisplayList();
		method public void endRecording();
		method public float getAlpha();

graphics/java/android/graphics/RenderNode.java

+11 −12

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ import java.lang.annotation.RetentionPolicy;
		* top-level content is desired, and finally calling {@link Surface#unlockCanvasAndPost(Canvas)}.
		* </p>
		*/
		public class RenderNode {
		public final class RenderNode {

		// Use a Holder to allow static initialization in the boot image.
		private static class NoImagePreloadHolder {
		@@ -178,6 +178,16 @@ public class RenderNode {
		private final AnimationHost mAnimationHost;
		private RecordingCanvas mCurrentRecordingCanvas;

		/**
		* Creates a new RenderNode that can be used to record batches of
		* drawing operations, and store / apply render properties when drawn.
		*
		* @param name The name of the RenderNode, used for debugging purpose. May be null.
		*/
		public RenderNode(String name) {
		this(name, null);
		}

		private RenderNode(String name, AnimationHost animationHost) {
		mNativeRenderNode = nCreate(name);
		NoImagePreloadHolder.sRegistry.registerNativeAllocation(this, mNativeRenderNode);
		@@ -193,17 +203,6 @@ public class RenderNode {
		mAnimationHost = null;
		}

		/**
		* Creates a new RenderNode that can be used to record batches of
		* drawing operations, and store / apply render properties when drawn.
		*
		* @param name The name of the RenderNode, used for debugging purpose. May be null.
		* @return A new RenderNode.
		*/
		public static @NonNull RenderNode create(@Nullable String name) {
		return new RenderNode(name, null);
		}

		/** @hide */
		public static RenderNode create(String name, @Nullable AnimationHost animationHost) {
		return new RenderNode(name, animationHost);