summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2014-12-11 10:03:19 -0800
committerRich Slogar <rslogar@google.com>2014-12-11 10:03:19 -0800
commitd282ba778b3a8692ef21ed4762d839213a507bf4 (patch)
treed1349b45d21aead0396818be61580b00bb3dd5fe
parent5155840ba091f62ea3079328b25a620089223887 (diff)
downloadframeworks_base-d282ba778b3a8692ef21ed4762d839213a507bf4.zip
frameworks_base-d282ba778b3a8692ef21ed4762d839213a507bf4.tar.gz
frameworks_base-d282ba778b3a8692ef21ed4762d839213a507bf4.tar.bz2
docs: studio basics haxm updates
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
-rw-r--r--docs/html/tools/studio/index.jd10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 20c41e0..bdd6153 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -234,8 +234,8 @@ new virtual devices for running your app in the emulator.</p>
<p>The AVD Manager comes with emulators for Nexus 6 and Nexus 9 devices and also supports
creating custom Android device skins based on specific emulator properties and assigning those
-skins to hardware profiles. Android Studio installs the the Intel x86 Emulator Accelerator (HAXM)
-and creates a default emulator for quick app prototyping.</p>
+skins to hardware profiles. Android Studio installs the Intel&#174; x86 Hardware Accelerated Execution
+Manager (HAXM) emulator accelerator and creates a default emulator for quick app prototyping.</p>
<p>For more information, see <a href="{@docRoot}tools/devices/managing-avds.html">Managing AVDs</a>.</p>
@@ -333,7 +333,7 @@ controlling device behaviors, and more. It also includes the Hierarchy Viewer to
<p>An updated installation and setup wizards walk you through a step-by-step installation
and setup process as the wizard checks for system requirements, such as the Java Development
Kit (JDK) and available RAM, and then prompts for optional installation options, such as the
-Intel &#174; HAXM accelerator.</p>
+Intel&#174; HAXM emulator accelerator.</p>
<p>An updated setup wizard walks you through the setup processes as
the wizard updates your system image and emulation requirements, such GPU, and then creates
@@ -385,7 +385,7 @@ code-level preference:
-<h2 id="other">Other Highlights/h2>
+<h2 id="other">Other Highlights</h2>
<h3> Translation Editor</h3>
<p>Multi-language support is enhanced with the Translation Editor plugin so you can easily add
@@ -413,5 +413,5 @@ and &lt;animated-selector&gt;, are supported.</p>
<p>Clicking <strong>Import Samples</strong> from the <strong>File</strong> menu or Welcome page
provides seamless access to Google code samples on GitHub.</p>
<p><img src="{@docRoot}images/tools/studio-samples-githubaccess.png" /></p>
- <p class="img-caption"><strong>Figure 12.</strong> Code Sample Access/p>
+ <p class="img-caption"><strong>Figure 12.</strong> Code Sample Access</p>