diff options
author | Derek Sollenberger <djsollen@google.com> | 2015-06-22 15:38:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-22 15:38:11 +0000 |
commit | b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c (patch) | |
tree | 035fbfffb50661ef345e8b3122d721f618ee0564 | |
parent | 616f035bc9a2d9855feb2348d2b732a18ebdbffb (diff) | |
parent | e109940d81cc67fcdb2e2bbb79dce9039ead86c6 (diff) | |
download | frameworks_base-b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c.zip frameworks_base-b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c.tar.gz frameworks_base-b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c.tar.bz2 |
Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev
-rw-r--r-- | core/java/android/view/DisplayListCanvas.java | 6 | ||||
-rw-r--r-- | docs/html/guide/topics/graphics/hardware-accel.jd | 2 | ||||
-rw-r--r-- | graphics/java/android/graphics/Picture.java | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/core/java/android/view/DisplayListCanvas.java b/core/java/android/view/DisplayListCanvas.java index 52a12f3..3c21981 100644 --- a/core/java/android/view/DisplayListCanvas.java +++ b/core/java/android/view/DisplayListCanvas.java @@ -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 - } } diff --git a/docs/html/guide/topics/graphics/hardware-accel.jd b/docs/html/guide/topics/graphics/hardware-accel.jd index 3d1935a..e3f1d9e 100644 --- a/docs/html/guide/topics/graphics/hardware-accel.jd +++ b/docs/html/guide/topics/graphics/hardware-accel.jd @@ -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> diff --git a/graphics/java/android/graphics/Picture.java b/graphics/java/android/graphics/Picture.java index 39272b9..0e55089 100644 --- a/graphics/java/android/graphics/Picture.java +++ b/graphics/java/android/graphics/Picture.java @@ -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 |