diff options
| author | Scott Main <smain@google.com> | 2011-02-14 14:44:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-14 14:44:30 -0800 |
| commit | 753c22cfecb04cfdccea3b92197f73e7328d0b15 (patch) | |
| tree | 3f8e3533b8c7c45243d0f5ce99b696baca32e223 /docs | |
| parent | 2d022d01d0689b61de87bbf9ffd47703ceae1596 (diff) | |
| parent | 865cd1ca5c31243764545dc888ee117a9215e837 (diff) | |
| download | frameworks_base-753c22cfecb04cfdccea3b92197f73e7328d0b15.zip frameworks_base-753c22cfecb04cfdccea3b92197f73e7328d0b15.tar.gz frameworks_base-753c22cfecb04cfdccea3b92197f73e7328d0b15.tar.bz2 | |
am 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb
* commit '865cd1ca5c31243764545dc888ee117a9215e837':
docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 29 | ||||
| -rw-r--r-- | docs/html/guide/topics/clipboard/copy-paste.jd | 2 |
2 files changed, 14 insertions, 17 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 9e754db..9f2eff8 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -65,6 +65,9 @@ <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html"> <span class="en">Fragments</span> </a> <span class="new">new!</span></li> + <li><a href="<?cs var:toroot ?>guide/topics/providers/loaders.html"> + <span class="en">Loaders</span> + </a><span class="new">new!</span></li> <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/tasks-and-back-stack.html"> <span class="en">Tasks and Back Stack</span> </a></li> @@ -95,8 +98,9 @@ <ul> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/ui/index.html"> - <span class="en">User Interface</span> - </a></div> + <span class="en">User Interface</span> + </a> + <span class="new">more!</span></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html"> <span class="en">Declaring Layout</span> @@ -194,14 +198,6 @@ </li> </ul> </li> - - <li><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html"> - <span class="en">Content Providers</span> - </a></li> - <li><a href="<?cs var:toroot ?>guide/topics/providers/loaders.html"> - <span class="en">Loaders</span> - </a><span class="new">new!</span></li> - <li><a href="<?cs var:toroot ?>guide/topics/security/security.html"> <span class="en">Security and Permissions</span> </a></li> @@ -242,8 +238,9 @@ <ul> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html"> - <span class="en">Graphics</span> - </a></div> + <span class="en">Graphics</span> + </a> + <span class="new">more!</span></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html"> <span class="en">2D Graphics</span> @@ -262,15 +259,15 @@ </a></li> </ul> </li> + <li><a href="<?cs var:toroot ?>guide/topics/media/index.html"> + <span class="en">Audio and Video</span> + </a></li> <li> <a href="<?cs var:toroot ?>guide/topics/clipboard/copy-paste.html"> - <span class="en">Copying and Pasting</span> + <span class="en">Copy and Paste</span> </a> <span class="new">new!</span> </li> - <li><a href="<?cs var:toroot ?>guide/topics/media/index.html"> - <span class="en">Audio and Video</span> - </a></li> <!--<li class="toggle-list"> <div><a style="color:gray;">Sensors</a></div> <ul> diff --git a/docs/html/guide/topics/clipboard/copy-paste.jd b/docs/html/guide/topics/clipboard/copy-paste.jd index 9a50a35..6c86f47 100644 --- a/docs/html/guide/topics/clipboard/copy-paste.jd +++ b/docs/html/guide/topics/clipboard/copy-paste.jd @@ -1,4 +1,4 @@ -page.title=Copying and Pasting +page.title=Copy and Paste @jd:body <div id="qv-wrapper"> <div id="qv"> |