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

Commit 83c8b8a3 authored by Joe Malin's avatar Joe Malin Committed by Android (Google) Code Review
Browse files

Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb

parents 02d2b5a4 dd05f181

docs/html/guide/guide_toc.cs

+30 −19
Original line number Diff line number Diff line
@@ -125,7 +125,12 @@ 
                <span class="en">Creating Status Bar Notifications</span>

              </a></li>

            </ul>

          </li><!-- end of notifying the user -->

          </li>

          <li>

              <a href="<?cs var:toroot ?>guide/topics/ui/drag-drop.html">

                  Dragging and Dropping

              </a><span class="new">new!</span>

          </li>

          <li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html">

                <span class="en">Applying Styles and Themes</span>

              </a></li>
@@ -248,6 +253,12 @@ 
              </a></li>

        </ul>

      </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">

            <span class="en">Audio and Video</span>

          </a></li>
@@ -399,7 +410,7 @@ 
      <li class="toggle-list">

        <div>

           <a href="<?cs var:toroot ?>guide/developing/devices/index.html">

        	     <span class="en">Managing Virtual Devices</span>

                <span class="en">Creating and Managing Virtual Devices</span>

            </a>

        </div>

        <ul>
@@ -410,7 +421,7 @@ 
          </li>

          <li>

            <a href="<?cs var:toroot ?>guide/developing/devices/managing-avds-cmdline.html">

              <span class="en">From the Command Line</span>

              <span class="en">On the Command Line</span>

            </a>

          </li>

          <li>
@@ -440,7 +451,7 @@ 
          </li>

          <li>

            <a href="<?cs var:toroot ?>guide/developing/projects/projects-cmdline.html">

        	    <span class="en">From the Command Line</span>

                <span class="en">On the Command Line</span>

            </a>

          </li>

        </ul>
@@ -470,12 +481,12 @@ 
        <ul>

          <li>

            <a href="<?cs var:toroot ?>guide/developing/debugging/debugging-projects.html">

         	    <span class="en">From Eclipse with ADT</span>

                <span class="en">In Eclipse with ADT</span>

            </a>

          </li>

          <li>

            <a href="<?cs var:toroot ?>guide/developing/debugging/debugging-projects-cmdline.html">

         	    <span class="en">From Other IDEs</span>

                <span class="en">In Other IDEs</span>

            </a>

          </li>

          <li>
@@ -485,7 +496,7 @@ 
          </li>

          <li>

            <a href="<?cs var:toroot ?>guide/developing/debugging/debugging-log.html">

         	    <span class="en">Reading and Writing Logs</span>

                <span class="en">Reading and Writing Log Messages</span>

            </a>

          </li>

          <li>

docs/html/guide/topics/clipboard/copy-paste.jd

0 → 100644
+1094 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/guide/topics/ui/drag-drop.jd

0 → 100644
+995 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/images/ui/clipboard/copy_paste_framework.png

0 → 100755
+37.1 KiB
Loading image diff...