diff options
| author | Robert Ly <robertly@google.com> | 2011-10-12 15:32:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-12 15:32:38 -0700 |
| commit | a9a21c2aa900fe63c4e9ccce4d62387d921a4b74 (patch) | |
| tree | 7bd877429ba48179ef756f41a047c06a6220a8ef | |
| parent | 83b740ab1e1de378edfd4d2f78c8f2a7f7ce810a (diff) | |
| parent | 3401c0e4806c2692f2b39ac6057cc48c2c8a0fd1 (diff) | |
| download | frameworks_base-a9a21c2aa900fe63c4e9ccce4d62387d921a4b74.zip frameworks_base-a9a21c2aa900fe63c4e9ccce4d62387d921a4b74.tar.gz frameworks_base-a9a21c2aa900fe63c4e9ccce4d62387d921a4b74.tar.bz2 | |
Merge "DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215" into ics-mr0
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 2f50ce7..f3540e2 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -233,23 +233,32 @@ </ul> <ul> - <li class="toggle-list"> + <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html"> <span class="en">Graphics</span> - </a></div> + </a><span class="new-child">new!</span></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html"> - <span class="en">2D Graphics</span> - </a></li> + <span class="en">Canvas and Drawables</span></a></li> + <li><a href="<?cs var:toroot ?>guide/topics/graphics/hardware-accel.html"> + <span class="en">Hardware Acceleration</span></a> + <span class="new">new!</span></li> <li><a href="<?cs var:toroot ?>guide/topics/graphics/opengl.html"> - <span class="en">3D with OpenGL</span> - </a></li> - <li><a href="<?cs var:toroot ?>guide/topics/graphics/animation.html"> - <span class="en">Property Animation</span> - </a></li> + <span class="en">OpenGL</span> + </a><span class="new">updated</span></li> + </ul> + </li> + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>guide/topics/graphics/animation.html"> + <span class="en">Animation</span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>guide/topics/graphics/prop-animation.html"> + <span class="en">Property Animation</span></a></li> <li><a href="<?cs var:toroot ?>guide/topics/graphics/view-animation.html"> - <span class="en">View Animation</span> - </a></li> + <span class="en">View Animation</span></a></li> + <li><a href="<?cs var:toroot ?>guide/topics/graphics/drawable-animation.html"> + <span class="en">Drawable Animation</span></a></li> </ul> </li> <li class="toggle-list"> @@ -258,7 +267,7 @@ </a></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/renderscript/graphics.html"> - <span class="en">3D Graphics</span> + <span class="en">Graphics</span> </a> </li> <li><a href="<?cs var:toroot ?>guide/topics/renderscript/compute.html"> |