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

Commit e89b6969 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0

parents c408a5d5 89c45b3e

docs/html/guide/developing/devices/emulator.jd

+8 −3
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ parent.link=index.html 
        </ol>

      </li>

    </ol>



  <h2>See also</h2>

  <ol>

    <li><a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a></li>

    <li><a href="{@docRoot}guide/developing/devices/managing-avds.html">Managing AVDs with AVD Manager</a></li>

  </ol>

</div>

</div>
@@ -63,8 +69,6 @@ on the data channel.</p> 










<h2  id="overview">Overview</h2>



<p>The Android emulator is a QEMU-based application that provides a virtual ARM
@@ -166,7 +170,8 @@ on the Emulator</a> for information about how to install your application.</p> 


<p>To stop an emulator instance, just close the emulator's window.</p>





<p>For a reference of the emulator's startup commands and keyboard mapping, see

the <a href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a> document.</p>

docs/html/guide/developing/tools/emulator.jd

+23 −1
Original line number Diff line number Diff line
@@ -3,6 +3,25 @@ parent.title=Tools 
parent.link=index.html

@jd:body



<div id="qv-wrapper">

<div id="qv">



  <h2>In this document</h2>

  <ol>

    <li><a href="#startup-options">Emulator Startup Options</a></li>

    <li><a href="#KeyMapping">Emulator Keyboard Mapping</a></li>

  </ol>



  <h2>See also</h2>

  <ol>

    <li><a href="{@docRoot}guide/developing/devices/emulator.html">Using the Android Emulator</a></li>

    <li><a href="{@docRoot}guide/developing/devices/index.html">Managing Virtual Devices</a></li>

  </ol>



</div>

</div>





<p>The Android SDK includes a mobile device emulator &mdash; a virtual mobile device 

that runs on your computer. The emulator lets you develop and test

Android applications without using a physical device.</p>
@@ -451,7 +470,10 @@ Managing Virtual Devices with AVD Manager</a>. 
  <td>See comments for <code>-skin</code>, above.</td></tr>

</table>



<h2>Emulator Keyboard Mapping</h2>





<h2 id="KeyMapping">Emulator Keyboard Mapping</h2>



<p>The table below summarizes the mappings between the emulator keys and and 

the keys of your keyboard. </p>

<p class="table-caption"><strong>Table 2.</strong> Emulator keyboard mapping</p>