diff options
author | David Friedman <dmail@google.com> | 2015-08-17 18:15:50 -0700 |
---|---|---|
committer | David Friedman <dmail@google.com> | 2015-08-17 18:45:36 -0700 |
commit | eaabddf1219bbff2b12d2660ee94f42afd900cbe (patch) | |
tree | 5c7e52fa443b22a0596d0393224687be006a4c12 /docs/html/sdk | |
parent | 7aa6fc67d7c1c02cd2e99e8d94b4c0b8918c4d3f (diff) | |
download | frameworks_base-eaabddf1219bbff2b12d2660ee94f42afd900cbe.zip frameworks_base-eaabddf1219bbff2b12d2660ee94f42afd900cbe.tar.gz frameworks_base-eaabddf1219bbff2b12d2660ee94f42afd900cbe.tar.bz2 |
Docs: Fixing files that didn't merge properly from mnc-preview-docs
Change-Id: If1a97d8da5a8e7f65293bc34e1a1646f06a48043
Diffstat (limited to 'docs/html/sdk')
-rw-r--r-- | docs/html/sdk/installing/adding-packages.jd | 6 | ||||
-rw-r--r-- | docs/html/sdk/installing/index.jd | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd index 58a8065..88619bd 100644 --- a/docs/html/sdk/installing/adding-packages.jd +++ b/docs/html/sdk/installing/adding-packages.jd @@ -64,10 +64,10 @@ So before you can start, there are a few packages you should add to your Android <p>To start adding packages, launch the Android SDK Manager in one of the following ways:</p> <ul> - <li>In Eclipse or Android Studio, click <strong>SDK Manager</strong> + <li>In Android Studio, click <strong>SDK Manager</strong> <img src="{@docRoot}images/tools/sdk-manager-studio.png" style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li> - <li>If you're not using Eclipse or Android Studio: + <li>If you're not using Android Studio: <ul> <li>Windows: Double-click the <code>SDK Manager.exe</code> file at the root of the Android SDK directory.</li> @@ -77,7 +77,7 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li> </li> </ul> -<p>When you open the SDK Manager for the first time, several packages will be selected by +<p>When you open the SDK Manager for the first time, several packages are selected by default. Leave these selected, but be sure you have everything you need to get started by following these steps:</p> diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 45d1890..dc258db 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -87,7 +87,7 @@ where they are installed. For example:</p> <p><b>To set up Android Studio on Mac OSX:</b></p> <ol> - <li>Unzip the downloaded zip file, {@code android-studio-ide-<version>-mac.zip}.</li> + <li>Launch the {@code .dmg} file you just downloaded.</li> <li>Drag and drop Android Studio into the Applications folder. <li>Open Android Studio and follow the setup wizard to install any necessary SDK tools. <p> @@ -97,13 +97,11 @@ where they are installed. For example:</p> <strong>Allow applications downloaded from</strong>, select <strong>Anywhere</strong>. Then open Android Studio again.</p> </li> - <li>Follow the links to install the SDK outside of the Android Studio directories.</li> </ol> -<p>The individual tools and other SDK packages are saved outside the Android Studio application -directory. If you need access the tools directly, use a terminal to navigate into the location -where they are installed. For example:</p> -<p><code>/Applications/sdk/</code></p> +<p>If you need use the Android SDK tools from a command line, +you can access them at:</p> +<p><code>/Users/<user>/Library/Android/sdk/</code></p> </div><!-- end mac --> @@ -114,7 +112,7 @@ where they are installed. For example:</p> <p><b>To set up Android Studio on Linux:</b></p> <ol> - <li>Unpack the downloaded Tar file, {@code android-studio-ide-<version>-linux.zip}, into an + <li>Unpack the downloaded ZIP file into an appropriate location for your applications. <li>To launch Android Studio, navigate to the {@code android-studio/bin/} directory in a terminal and execute {@code studio.sh}. |