diff options
| author | Joe Fernandez <joefernandez@google.com> | 2014-12-12 04:19:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-12 04:19:03 +0000 |
| commit | 6ea9db4b6434b9f2c1059e7c4a050ea4245a7342 (patch) | |
| tree | b17b64437efd980c08319be023be282c0a0dce0e /docs | |
| parent | c0276ebd93554b9c3bfde2587b00ca79afa6ed05 (diff) | |
| parent | a878256b59e1766ce918257dbfe343b0d3d0ec2d (diff) | |
| download | frameworks_base-6ea9db4b6434b9f2c1059e7c4a050ea4245a7342.zip frameworks_base-6ea9db4b6434b9f2c1059e7c4a050ea4245a7342.tar.gz frameworks_base-6ea9db4b6434b9f2c1059e7c4a050ea4245a7342.tar.bz2 | |
am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
automerge: a878256
* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
docs: studio basics haxm updates
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/tools/studio/index.jd | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd index 258fedb..7480f57 100644 --- a/docs/html/tools/studio/index.jd +++ b/docs/html/tools/studio/index.jd @@ -235,8 +235,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® 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> @@ -334,7 +334,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 ® HAXM accelerator.</p> +Intel® 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 @@ -386,7 +386,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 @@ -414,5 +414,5 @@ and <animated-selector>, 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> |