drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Scott Main
2011-10-13 13:46:23 -07:00
committed by Android (Google) Code Review
parent c408a5d573 89c45b3ef0
commit e89b69691f
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docs/html/guide/developing/devices/emulator.jd
View File

@ -32,6 +32,12 @@ parent.link=index.html
</ol> </ol>
</li> </li>
</ol> </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>
</div> </div>
@ -63,8 +69,6 @@ on the data channel.</p>
<h2 id="overview">Overview</h2> <h2 id="overview">Overview</h2>
<p>The Android emulator is a QEMU-based application that provides a virtual ARM <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>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>

24
docs/html/guide/developing/tools/emulator.jd
View File

@ -3,6 +3,25 @@ parent.title=Tools
parent.link=index.html parent.link=index.html
@jd:body @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 <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 that runs on your computer. The emulator lets you develop and test
Android applications without using a physical device.</p> 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> <td>See comments for <code>-skin</code>, above.</td></tr>
</table> </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 <p>The table below summarizes the mappings between the emulator keys and and
the keys of your keyboard. </p> the keys of your keyboard. </p>
<p class="table-caption"><strong>Table 2.</strong> Emulator keyboard mapping</p> <p class="table-caption"><strong>Table 2.</strong> Emulator keyboard mapping</p>