Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb

Browse Source
This commit is contained in:
Scott Main
2011-02-14 14:42:18 -08:00
committed by Android (Google) Code Review
parent 9ab0f2b220 c059fa4de4
commit 865cd1ca5c
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
docs/html/guide/guide_toc.cs
View File

@@ -65,6 +65,9 @@
<li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html"> <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html">
<span class="en">Fragments</span> <span class="en">Fragments</span>
</a> <span class="new">new!</span></li> </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"> <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/tasks-and-back-stack.html">
<span class="en">Tasks and Back Stack</span> <span class="en">Tasks and Back Stack</span>
</a></li> </a></li>
@@ -95,8 +98,9 @@
<ul> <ul>
<li class="toggle-list"> <li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/ui/index.html"> <div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">
<span class="en">User Interface</span> <span class="en">User Interface</span>
</a></div> </a>
<span class="new">more!</span></div>
<ul> <ul>
<li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html"> <li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html">
<span class="en">Declaring Layout</span> <span class="en">Declaring Layout</span>
@@ -194,14 +198,6 @@
</li> </li>
</ul> </ul>
</li> </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"> <li><a href="<?cs var:toroot ?>guide/topics/security/security.html">
<span class="en">Security and Permissions</span> <span class="en">Security and Permissions</span>
</a></li> </a></li>
@@ -242,8 +238,9 @@
<ul> <ul>
<li class="toggle-list"> <li class="toggle-list">
<div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html"> <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">
<span class="en">Graphics</span> <span class="en">Graphics</span>
</a></div> </a>
<span class="new">more!</span></div>
<ul> <ul>
<li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html"> <li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html">
<span class="en">2D Graphics</span> <span class="en">2D Graphics</span>
@@ -262,15 +259,15 @@
</a></li> </a></li>
</ul> </ul>
</li> </li>
<li>
<a href="<?cs var:toroot ?>guide/topics/clipboard/copy-paste.html">
<span class="en">Copying and Pasting</span>
</a>
<span class="new">new!</span>
</li>
<li><a href="<?cs var:toroot ?>guide/topics/media/index.html"> <li><a href="<?cs var:toroot ?>guide/topics/media/index.html">
<span class="en">Audio and Video</span> <span class="en">Audio and Video</span>
</a></li> </a></li>
<li>
<a href="<?cs var:toroot ?>guide/topics/clipboard/copy-paste.html">
<span class="en">Copy and Paste</span>
</a>
<span class="new">new!</span>
</li>
<!--<li class="toggle-list"> <!--<li class="toggle-list">
<div><a style="color:gray;">Sensors</a></div> <div><a style="color:gray;">Sensors</a></div>
<ul> <ul>

2
docs/html/guide/topics/clipboard/copy-paste.jd
View File

@@ -1,4 +1,4 @@
page.title=Copying and Pasting page.title=Copy and Paste
@jd:body @jd:body
<div id="qv-wrapper"> <div id="qv-wrapper">
<div id="qv"> <div id="qv">