diff options
| author | Scott Main <smain@google.com> | 2014-02-22 00:43:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-22 00:43:26 +0000 |
| commit | 25b44ae684295b53ac7ba15d827fc03c51aee37b (patch) | |
| tree | f1a6c97ff142c665353ee22a9dffb1d72519b0d5 | |
| parent | af87e19bdbf6b16240dcdbfd31fe4f33eca4e51d (diff) | |
| parent | d5251a387e3fec8a91e0a28171ff71582049d3ce (diff) | |
| download | frameworks_base-25b44ae684295b53ac7ba15d827fc03c51aee37b.zip frameworks_base-25b44ae684295b53ac7ba15d827fc03c51aee37b.tar.gz frameworks_base-25b44ae684295b53ac7ba15d827fc03c51aee37b.tar.bz2 | |
Merge "add android studio to launch procedures" into klp-docs
| -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 |