diff options
| author | Scott Main <smain@google.com> | 2011-10-13 13:46:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 13:46:23 -0700 |
| commit | e89b69691f6593d4287dd1d02c5d31561f6d4aa8 (patch) | |
| tree | 40168154c7533b9b19d4b8eb94ca219a7ce2a476 /docs/html | |
| parent | c408a5d5738c84160a7e9a8299c953ea638bcef4 (diff) | |
| parent | 89c45b3ef0ad47edb421b2abe89d990faa25ffbb (diff) | |
| download | frameworks_base-e89b69691f6593d4287dd1d02c5d31561f6d4aa8.zip frameworks_base-e89b69691f6593d4287dd1d02c5d31561f6d4aa8.tar.gz frameworks_base-e89b69691f6593d4287dd1d02c5d31561f6d4aa8.tar.bz2 | |
Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/guide/developing/devices/emulator.jd | 11 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/emulator.jd | 24 |
2 files changed, 31 insertions, 4 deletions
diff --git a/docs/html/guide/developing/devices/emulator.jd b/docs/html/guide/developing/devices/emulator.jd index fe00531..8211275 100644 --- a/docs/html/guide/developing/devices/emulator.jd +++ b/docs/html/guide/developing/devices/emulator.jd @@ -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> diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd index ff667f2..5151ec1 100644 --- a/docs/html/guide/developing/tools/emulator.jd +++ b/docs/html/guide/developing/tools/emulator.jd @@ -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 — 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> |