diff options
Diffstat (limited to 'docs/html/sdk')
| -rw-r--r-- | docs/html/sdk/installing/index.jd | 95 |
1 files changed, 42 insertions, 53 deletions
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 1e732da7d885..203d2ffcf8aa 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -32,16 +32,13 @@ p.paging-links { <p>Android Studio provides everything you need to start developing apps for Android, including the Android Studio IDE and the Android SDK tools.</p> -<p>If you didn't download Android Studio, go <a href="{@docRoot}sdk/index.html" -><b>download Android Studio now</b></a>, or switch to the -<a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools -install</a> instructions.</p> +<p class="note"><strong>Note:</strong> If you have not yet downloaded Android Studio, <a href="{@docRoot}sdk/index.html" +><b>download</b></a> it now.</p> -<p>Before you set up Android Studio, be sure you have installed -JDK 6 or higher (the JRE alone is not sufficient)—JDK 7 is required when -developing for Android 5.0 and higher. To check if you -have JDK installed (and which version), open a terminal and type <code>javac -version</code>. +<p>Before installing Android Studio, make sure you have JDK 6 or higher installed—the JRE +alone is not sufficient. When developing for Android 5.0 (API level 21) and higher, you will need to install JDK 7. +To check if you have the correct version of the JDK installed, open a terminal and type <code>javac -version</code>. If the JDK is not available or the version is lower than version 6, download the <a href="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html" class="external-link" >Java SE Development Kit 7</a>.</p> @@ -57,10 +54,10 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;' <p><b>To set up Android Studio on Windows:</b></p> <ol> - <li>Launch the <code>.exe</code> file you just downloaded.</li> + <li>Launch the {@code .exe} file you downloaded.</li> <li>Follow the setup wizard to install Android Studio and any necessary SDK tools. - <p>On some Windows systems, the launcher script does not find where Java is installed. + <p>On some Windows systems, the launcher script does not find where the JDK is installed. If you encounter this problem, you need to set an environment variable indicating the correct location.</p> <p>Select <strong>Start menu > Computer > System Properties > @@ -69,11 +66,10 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;' your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p> </p> </li> - </ol> -<p>The individual tools and other SDK packages are saved outside the Android Studio application +<p>The individual tools and other SDK packages used by Android Studio are installed in a separate directory. If you need to access the tools directly, use a terminal to navigate to the location where they are installed. For example:</p> <p><code>\Users\<user>\sdk\</code></p> @@ -87,7 +83,7 @@ where they are installed. For example:</p> <p><b>To set up Android Studio on Mac OSX:</b></p> <ol> - <li>Launch the {@code .dmg} file you just downloaded.</li> + <li>Launch the {@code .dmg} file you 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. </li> @@ -106,30 +102,30 @@ you can access them at:</p> <p><b>To set up Android Studio on Linux:</b></p> <ol> - <li>Unpack the downloaded ZIP file into an + <li>Unpack the {@code .zip} file you downloaded to 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}. + <li>To launch Android Studio, open a terminal, navigate to the {@code android-studio/bin/} directory, + and execute {@code studio.sh}. <p>You may want to add {@code android-studio/bin/} to your PATH environmental variable so that you can start Android Studio from any directory.</p> </li> <li>If the SDK is not already installed, follow the setup wizard to install the SDK and any necessary SDK tools. - <p class="note"><strong>Note:</strong> You may also need to install the ia32-libs, - lib32ncurses5-dev, and lib32stdc++6 packages. These packages are required to support 32-bit apps - on a 64-bit machine. </p> + <p class="note"><strong>Note:</strong> To support 32-bit apps + on a 64-bit machine, you will need to install the ia32-libs, + lib32ncurses5-dev, and lib32stdc++6 packages.</p> </li> </ol> </div><!-- end linux --> </div><!-- end procedure box --> -<p>Android Studio is now ready and loaded with the Android developer tools, but there are still a -couple packages you should add to make your Android SDK complete.</p> +<p>You can now start developing apps in Android Studio! Later on, you may want to add packages or +update them.</p> <p class="paging-links"> <a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link"> -Continue: Adding SDK Packages</a></p> +Optional: Adding SDK Packages</a></p> </div> @@ -151,10 +147,9 @@ Continue: Adding SDK Packages</a></p> It includes only the core SDK tools, which you can access from a command line or with a plugin for your favorite IDE (if available).</p> -<p>If you didn't download the SDK tools, go <a href="{@docRoot}sdk/index.html#Other" -><b>download the SDK now</b></a>, -or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio -install</a> instructions.</p> +<p class="note"><strong>Note:</strong> If you have not yet downloaded the SDK tools, <a href="{@docRoot}sdk/index.html#Other" +><b>download</b></a> them now. For a complete IDE and Android SDK package, we recommend <a href="{@docRoot}sdk/index.html" +><b>downloading Android Studio</b></a>.</p> <div class="procedure-box"> @@ -167,14 +162,13 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;' <p><b>To get started on Windows:</b></p> <p>Your download package is an executable file that starts an installer. The installer checks your machine - for required tools, such as the proper Java SE Development Kit (JDK) and installs it if necessary. - The installer then saves the Android SDK Tools to a specified the location outside of the Android - Studio directories.</p> + for required tools, such as the proper Java SE Development Kit (JDK), and installs them if necessary. + The installer then saves the Android SDK Tools to a specified location.</p> <ol> -<li>Double-click the executable ({@code .exe} file) to start the install.</li> -<li>Make a note of the name and location where you save the SDK on your system—you will need to -refer to the SDK directory later when using +<li>Double-click the {@code .exe} file to start the install.</li> +<li>Make a note of the name and location where you saved the SDK on your system—you will need to +refer to them later when using the SDK tools from the command line.</li> <li>Once the installation completes, the installer starts the Android SDK Manager. </li> @@ -188,13 +182,14 @@ the SDK tools from the command line.</li> <p><b>To get started on Mac OSX:</b></p> -<p>Unpack the ZIP file you've downloaded. By default, it's unpacked -into a directory named <code>android-sdk-mac_x86</code>. Move it to an appropriate location on your -machine, such as a "Development" directory in your home directory.</p> - -<p>Make a note of the name and location of the SDK directory on your system—you will need to -refer to the SDK directory later when using -the SDK tools from the command line.</p> +<ol> +<li>Unpack the {@code .zip} file you downloaded. By default, the file is unpacked +into a directory named <code>android-sdk-mac_x86</code>.</li> +<li>Move the directory to an appropriate location on your +machine, such as a "Development" directory in your home directory.</li> +<li>Make a note of the name and location of the SDK directory on your system—you will need to +refer to them later when using the SDK tools from the command line.</li> +</ol> </div> @@ -205,13 +200,11 @@ the SDK tools from the command line.</p> <p><b>To get started on Linux:</b></p> -<p>Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a -user-specified directory. </p> - -<p>Make a note of the name and location of the SDK directory on your system—you will need to -refer to the SDK directory later when using -the SDK tools from the command line.</p> - +<ol> +<li>Unpack the {@code .tgz} file you downloaded.</li> +<li>Make a note of the name and location of the unpacked SDK directory on your system—you will need to +refer to them later when using the SDK tools from the command line.</li> +</ol> <h5 id="Troubleshooting" style="margin-bottom:15px"><a href='' class="expandable" onclick="toggleExpandable(this,'#UbuntuTrouble');return false;" @@ -250,8 +243,8 @@ sudo apt-get install libncurses5:i386 libstdc++6:i386 zlib1g:i386</pre> </div><!-- end procedure box --> -<p>The Android SDK tools are now ready to begin developing apps, but there are still a -couple packages you should add to make your Android SDK complete.</p> +<p>Before you can begin developing apps with the Android SDK tools, you must install a few +additional packages.</p> <p class="paging-links"> <a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link"> @@ -275,11 +268,7 @@ Continue: Adding SDK Packages</a></p> <div id="default" style="display:none"> -<p>If you haven't already, <b><a href="{@docRoot}sdk/index.html">download -the Android SDK bundle for Android Studio</a></b> or the -<a href="{@docRoot}sdk/index.html#Other">stand-alone SDK Tools</a>. </p> - -<p>Then, select which SDK bundle you want to install:</p> +<p>Select the SDK bundle you want to install:</p> <div class="cols" style="margin:30px 0 60px"> |