diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 1e732da7d8859..203d2ffcf8aa6 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -32,16 +32,13 @@ p.paging-links {

Android Studio provides everything you need to start developing apps for Android, including the Android Studio IDE and the Android SDK tools.

-

If you didn't download Android Studio, go download Android Studio now, or switch to the -stand-alone SDK Tools -install instructions.

+

Note: If you have not yet downloaded Android Studio, download it now.

-

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 javac -version. +

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 javac -version. If the JDK is not available or the version is lower than version 6, download the Java SE Development Kit 7.

@@ -57,10 +54,10 @@ style="float:right;font-size:13px">To set up Android Studio on Windows:

    -
  1. Launch the .exe file you just downloaded.
    2. +
  2. Launch the {@code .exe} file you downloaded.
  3. Follow the setup wizard to install Android Studio and any necessary SDK tools. -

    On some Windows systems, the launcher script does not find where Java is installed. +

    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.

    Select Start menu > Computer > System Properties > @@ -69,11 +66,10 @@ style="float:right;font-size:13px">C:\Program Files\Java\jdk1.7.0_21.

    4. -
-

The individual tools and other SDK packages are saved outside the Android Studio application +

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:

\Users\<user>\sdk\

@@ -87,7 +83,7 @@ where they are installed. For example:

To set up Android Studio on Mac OSX:

    -
  1. Launch the {@code .dmg} file you just downloaded.
    2. +
  2. Launch the {@code .dmg} file you downloaded.
  3. Drag and drop Android Studio into the Applications folder.
  4. Open Android Studio and follow the setup wizard to install any necessary SDK tools.
    5. @@ -106,30 +102,30 @@ you can access them at:

    To set up Android Studio on Linux:

      -
    1. Unpack the downloaded ZIP file into an +
    2. Unpack the {@code .zip} file you downloaded to an appropriate location for your applications. -
    3. To launch Android Studio, navigate to the {@code android-studio/bin/} directory - in a terminal and execute {@code studio.sh}. +
    4. To launch Android Studio, open a terminal, navigate to the {@code android-studio/bin/} directory, + and execute {@code studio.sh}.

      You may want to add {@code android-studio/bin/} to your PATH environmental variable so that you can start Android Studio from any directory.

    5. If the SDK is not already installed, follow the setup wizard to install the SDK and any necessary SDK tools. -

      Note: 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.

      +

      Note: To support 32-bit apps + on a 64-bit machine, you will need to install the ia32-libs, + lib32ncurses5-dev, and lib32stdc++6 packages.

    -

    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.

    +

    You can now start developing apps in Android Studio! Later on, you may want to add packages or +update them.

    -Continue: Adding SDK Packages

    +Optional: Adding SDK Packages

    @@ -151,10 +147,9 @@ Continue: Adding SDK Packages

    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).

    -

    If you didn't download the SDK tools, go download the SDK now, -or switch to the Android Studio -install instructions.

    +

    Note: If you have not yet downloaded the SDK tools, download them now. For a complete IDE and Android SDK package, we recommend downloading Android Studio.

    @@ -167,14 +162,13 @@ style="float:right;font-size:13px">To get started on Windows:

    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.

    + 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.

      -
    1. Double-click the executable ({@code .exe} file) to start the install.
      2. -
    2. 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 +
    3. Double-click the {@code .exe} file to start the install.
      4. +
    4. 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.
    5. Once the installation completes, the installer starts the Android SDK Manager.
      6. @@ -188,13 +182,14 @@ the SDK tools from the command line.

      To get started on Mac OSX:

      -

      Unpack the ZIP file you've downloaded. By default, it's unpacked -into a directory named android-sdk-mac_x86. Move it to an appropriate location on your -machine, such as a "Development" directory in your home directory.

      - -

      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.

      +
        +
      1. Unpack the {@code .zip} file you downloaded. By default, the file is unpacked +into a directory named android-sdk-mac_x86.
        2. +
      2. Move the directory to an appropriate location on your +machine, such as a "Development" directory in your home directory.
        3. +
      3. 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.
        4. +
    @@ -205,13 +200,11 @@ the SDK tools from the command line.

    To get started on Linux:

    -

    Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a -user-specified directory.

    - -

    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.

    - +
      +
    1. Unpack the {@code .tgz} file you downloaded.
      2. +
    2. 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.
      3. +

    @@ -275,11 +268,7 @@ Continue: Adding SDK Packages