Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev (b2aea9dc) · Commits · e / os / android_frameworks_base

core/java/android/view/DisplayListCanvas.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -323,10 +323,4 @@ public class DisplayListCanvas extends Canvas {
		}

		private static native void nDrawRects(long renderer, long region, long paint);

		@Override
		public void drawPicture(Picture picture) {
		picture.endRecording();
		// TODO: Implement rendering
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ changed.</li>
		</tr>
		<tr>
		<td class="label_neg">drawPicture()</td>
		<td class="value_neg">✗</td>
		<td class="value_neg">23</td>
		</tr>
		<tr>
		<td class="label_pos">drawPosText()</td>

+4 −4

Original line number	Diff line number	Diff line
		@@ -135,8 +135,8 @@ public class Picture {
		* properly and are highly discouraged.
		*
		* <p>
		* <strong>Note:</strong> a picture created from an input stream cannot be
		* replayed on a hardware accelerated canvas.
		* <strong>Note:</strong> Prior to API level 23 a picture created from an
		* input stream cannot be replayed on a hardware accelerated canvas.
		*
		* @see #writeToStream(java.io.OutputStream)
		* @deprecated The recommended alternative is to not use writeToStream and
		@@ -155,8 +155,8 @@ public class Picture {
		* there is no guarantee that the Picture can be successfully reconstructed.
		*
		* <p>
		* <strong>Note:</strong> a picture created from an input stream cannot be
		* replayed on a hardware accelerated canvas.
		* <strong>Note:</strong> Prior to API level 23 a picture created from an
		* input stream cannot be replayed on a hardware accelerated canvas.
		*
		* @see #createFromStream(java.io.InputStream)
		* @deprecated The recommended alternative is to draw the picture into a