diff options
| author | Scott Main <smain@google.com> | 2014-02-22 01:01:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-22 01:01:18 +0000 |
| commit | a0e30c4b9dc1b0acb019f07c0d124d97740c93a2 (patch) | |
| tree | 1c69fa861fecd4fba0a9318406d11bacd9b67868 /docs/html | |
| parent | d2794f5eb308940e73906b97eb2e2f22edfbc78e (diff) | |
| parent | 5670ddea3bc16c43a2040a5a224ed5fda53d7072 (diff) | |
| download | frameworks_base-a0e30c4b9dc1b0acb019f07c0d124d97740c93a2.zip frameworks_base-a0e30c4b9dc1b0acb019f07c0d124d97740c93a2.tar.gz frameworks_base-a0e30c4b9dc1b0acb019f07c0d124d97740c93a2.tar.bz2 | |
am 5670ddea: am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '5670ddea3bc16c43a2040a5a224ed5fda53d7072':
add android studio to launch procedures
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/tools/help/avd-manager.jd | 7 | ||||
| -rw-r--r-- | docs/html/tools/help/sdk-manager.jd | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/docs/html/tools/help/avd-manager.jd b/docs/html/tools/help/avd-manager.jd index ed90f43..20f6253 100644 --- a/docs/html/tools/help/avd-manager.jd +++ b/docs/html/tools/help/avd-manager.jd @@ -8,8 +8,11 @@ and manage Android Virtual Devices (AVDs), which are required by the <p>You can launch the AVD Manager in one of the following ways:</p> <ul> - <li>In Eclipse: select <strong>Window > AVD Manager</strong>, or click - the AVD Manager icon in the Eclipse toolbar.</li> + <li>In Eclipse: select <strong>Window > Android Virtual Device Manager</strong>, or click + the AVD Manager icon in the toolbar.</li> + + <li>In Android Studio: select <strong>Tools > Android > AVD Manager</strong>, or click + the AVD Manager icon in the toolbar.</li> <li>In other IDEs: Navigate to your SDK's <code>tools/</code> directory and execute <code>android avd</code>.</li> diff --git a/docs/html/tools/help/sdk-manager.jd b/docs/html/tools/help/sdk-manager.jd index 276206f..57271bb 100644 --- a/docs/html/tools/help/sdk-manager.jd +++ b/docs/html/tools/help/sdk-manager.jd @@ -9,6 +9,8 @@ page.title=SDK Manager <ul> <li>From Eclipse (with <a href="{@docRoot}tools/help/adt.html">ADT</a>), select <strong>Window</strong> > <strong>Android SDK Manager</strong>.</li> + <li>From Android Studio, select <strong>Tools</strong> > <strong>Android</strong> + > <strong>SDK Manager</strong>.</li> <li>On Windows, double-click the <code>SDK Manager.exe</code> file at the root of the Android SDK directory.</li> <li>On Mac or Linux, open a terminal and navigate to the <code>tools/</code> directory in the |