Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14816409 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 753c22cf: am 865cd1ca: Merge "docs: update sidenav; move loaders under...

am 753c22cf: 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 '753c22cf':
  docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/
parents a6c4ad9d 753c22cf
Loading
Loading
Loading
Loading
+13 −16
Original line number Diff line number Diff line
@@ -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>
@@ -96,7 +99,8 @@
      <li class="toggle-list">
        <div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">
            <span class="en">User Interface</span>
             </a></div>
          </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>
@@ -243,7 +239,8 @@
      <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">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>
+1 −1
Original line number Diff line number Diff line
page.title=Copying and Pasting
page.title=Copy and Paste
@jd:body
<div id="qv-wrapper">
    <div id="qv">