diff options
| author | Joe Fernandez <joefernandez@google.com> | 2011-10-29 02:16:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-29 02:16:10 +0000 |
| commit | 74b2b9547329a0b05e0bd5701057696007b854bb (patch) | |
| tree | 40eea9e4308a3ff3cb5033ddf51a2f25b1872f62 /graphics/java | |
| parent | 76756a42dd68062349158f70d9b0ab95db908acc (diff) | |
| parent | 09848bc89de999416e2de82a7693b2deec6bf802 (diff) | |
| download | frameworks_base-74b2b9547329a0b05e0bd5701057696007b854bb.zip frameworks_base-74b2b9547329a0b05e0bd5701057696007b854bb.tar.gz frameworks_base-74b2b9547329a0b05e0bd5701057696007b854bb.tar.bz2 | |
am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
docs: add developer guide cross references, Project ACRE, round 3
Diffstat (limited to 'graphics/java')
4 files changed, 33 insertions, 8 deletions
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index eefd21e..e1c73fd 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -29,6 +29,12 @@ import javax.microedition.khronos.opengles.GL; * the draw calls (writing into the bitmap), a drawing primitive (e.g. Rect, * Path, text, Bitmap), and a paint (to describe the colors and styles for the * drawing). + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about how to use Canvas, read the + * <a href="{@docRoot}guide/topics/graphics/2d-graphics.html"> + * Canvas and Drawables</a> developer guide.</p></div> */ public class Canvas { // assigned in constructors, freed in finalizer diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index 0a3deb1..4b9c98f 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -103,9 +103,15 @@ import java.util.Arrays; * <li> <b>Scale</b>: a compound drawable with a single child drawable, * whose overall size is modified based on the current level. * </ul> - * <p>For information and examples of creating drawable resources (XML or bitmap files that - * can be loaded in code), see <a - * href="{@docRoot}guide/topics/resources/drawable-resource.html">Drawable Resources</a>. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about how to use drawables, read the + * <a href="{@docRoot}guide/topics/graphics/2d-graphics.html">Canvas and Drawables</a> developer + * guide. For information and examples of creating drawable resources (XML or bitmap files that + * can be loaded in code), read the + * <a href="{@docRoot}guide/topics/resources/drawable-resource.html">Drawable Resources</a> + * document.</p></div> */ public abstract class Drawable { private static final Rect ZERO_BOUNDS_RECT = new Rect(); diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index c32a5b6..bc7e906 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -31,9 +31,15 @@ import java.io.InputStream; /** * * A resizeable bitmap, with stretchable areas that you define. This type of image - * is defined in a .png file with a special format, described in <a link="../../../resources.html#ninepatch"> - * Resources</a>. + * is defined in a .png file with a special format. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about how to use a NinePatchDrawable, read the + * <a href="{@docRoot}guide/topics/graphics/2d-graphics.html#nine-patch"> + * Canvas and Drawables</a> developer guide. For information about creating a NinePatch image + * file using the draw9patch tool, see the + * <a href="{@docRoot}guide/developing/tools/draw9patch.html">Draw 9-patch</a> tool guide.</p></div> */ public class NinePatchDrawable extends Drawable { // dithering helps a lot, and is pretty cheap, so default is true diff --git a/graphics/java/android/graphics/drawable/ShapeDrawable.java b/graphics/java/android/graphics/drawable/ShapeDrawable.java index 4445b6a..a3622a2 100644 --- a/graphics/java/android/graphics/drawable/ShapeDrawable.java +++ b/graphics/java/android/graphics/drawable/ShapeDrawable.java @@ -34,9 +34,16 @@ import java.io.IOException; * the ShapeDrawable will default to a * {@link android.graphics.drawable.shapes.RectShape}. * - * <p>It can be defined in an XML file with the <code><shape></code> element. For more - * information, see the guide to <a - * href="{@docRoot}guide/topics/resources/drawable-resource.html">Drawable Resources</a>.</p> + * <p>This object can be defined in an XML file with the <code><shape></code> element.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about how to use ShapeDrawable, read the + * <a href="{@docRoot}guide/topics/graphics/2d-graphics.html#shape-drawable"> + * Canvas and Drawables</a> document. For more information about defining a ShapeDrawable in + * XML, read the + * <a href="{@docRoot}guide/topics/resources/drawable-resource.html#Shape">Drawable Resources</a> + * document.</p></div> * * @attr ref android.R.styleable#ShapeDrawablePadding_left * @attr ref android.R.styleable#ShapeDrawablePadding_top |