diff options
Diffstat (limited to 'docs/html/sdk/installing/index.jd')
| -rw-r--r-- | docs/html/sdk/installing/index.jd | 140 |
1 files changed, 69 insertions, 71 deletions
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 68f4eb7..744ce15 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -25,52 +25,6 @@ p.paging-links { -<!-- ################### ADT BUNDLE ####################### --> -<div id="adt" heading="Installing the Eclipse ADT Bundle" style="display:none"> - - -<p>The Eclipse ADT Bundle provides everything you need to start developing apps, including -the Android SDK tools and a version of the Eclipse IDE with built-in ADT -(Android Developer Tools) to streamline your Android app development.</p> - -<p>If you didn't download the Eclipse ADT bundle, go <a href="{@docRoot}sdk/index.html" -><b>download the Eclipse ADT bundle now</b></a>, or switch to the -<a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio -install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools -install</a> instructions</i>.</p> - -<div class="procedure-box"> -<p><b>To set up the ADT Bundle:</b></p> -<ol> -<li>Unpack the ZIP file -(named {@code adt-bundle-<os_platform>.zip}) and save it to an appropriate location, -such as a "Development" directory in your home directory.</li> -<li>Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch -<strong>Eclipse</strong>.</li> -</ol> - -<p class="caution"><strong>Caution:</strong> Do not move any of the files or directories -from the {@code adt-bundle-<os_platform>} directory. If you move the {@code eclipse/} -or {@code sdk/} directory, ADT will not be able to locate the SDK and you'll -need to manually update the ADT preferences.</p> -</div> - -<p>Eclipse with ADT 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 class="paging-links"> -<a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link"> -Continue: Adding SDK Packages</a></p> - - -</div> -<!-- ################ END ADT BUNDLE ##################### --> - - - - - - <!-- ################ STUDIO ##################### --> <div id="studio" heading="Installing Android Studio" style="display:none"> @@ -78,10 +32,9 @@ Continue: Adding SDK Packages</a></p> the Android Studio IDE (powered by IntelliJ) and guides you to install the Android SDK tools to streamline your Android app development.</p> -<p>If you didn't download Android Studio, go <a href="{@docRoot}sdk/installing/studio.html" +<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=adt">Eclipse ADT -install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools +<a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools install</a> instructions.</p> @@ -103,8 +56,7 @@ 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>Unzip the file, {@code android-studio-ide-<version>-windows.zip} and launch the - <code>studio.exe</code> file.</li> + <li>Launch the <code>.exe</code> file you just downloaded.</li> <li>Follow the setup wizard to install Android Studio and the SDK Tools. <p>On some Windows systems, the launcher script does not find where Java is installed. @@ -134,8 +86,9 @@ 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 instructions to set up the SDK. <p> Depending on your security settings, when you attempt to open Android Studio, you might see a warning that says the package is damaged and should be moved to the trash. If this @@ -143,13 +96,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 --> @@ -160,14 +111,14 @@ 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}. <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>Follow the links to install the SDK outside of the Android Studio directories.</li> + <li>Follow the links to install the SDK tools outside of the Android Studio directories.</li> </ol> </div><!-- end linux --> @@ -200,10 +151,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" +<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=adt">Eclipse ADT -install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio +or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio install</a> instructions.</p> @@ -239,7 +189,7 @@ 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 +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 @@ -255,7 +205,7 @@ 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 +<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 @@ -322,6 +272,52 @@ Continue: Adding SDK Packages</a></p> +<!-- ################### ADT BUNDLE ####################### --> +<div id="adt" heading="Installing the Eclipse ADT Bundle" style="display:none"> + + +<p>The Eclipse ADT Bundle provides everything you need to start developing apps, including +the Android SDK tools and a version of the Eclipse IDE with built-in ADT +(Android Developer Tools) to streamline your Android app development.</p> + +<p>If you didn't download the Eclipse ADT bundle, go <a href="{@docRoot}tools/eclipse/index.html" +><b>download the Eclipse ADT bundle now</b></a>, or switch to the +<a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio +install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools +install</a> instructions</i>.</p> + +<div class="procedure-box"> +<p><b>To set up the ADT Bundle:</b></p> +<ol> +<li>Unpack the ZIP file +(named {@code adt-bundle-<os_platform>.zip}) and save it to an appropriate location, +such as a "Development" directory in your home directory.</li> +<li>Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch +<strong>Eclipse</strong>.</li> +</ol> + +<p class="caution"><strong>Caution:</strong> Do not move any of the files or directories +from the {@code adt-bundle-<os_platform>} directory. If you move the {@code eclipse/} +or {@code sdk/} directory, ADT will not be able to locate the SDK and you'll +need to manually update the ADT preferences.</p> +</div> + +<p>Eclipse with ADT 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 class="paging-links"> +<a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link"> +Continue: Adding SDK Packages</a></p> + + +</div> +<!-- ################ END ADT BUNDLE ##################### --> + + + + + + <!-- ################ DEFAULT ##################### --> @@ -329,16 +325,12 @@ 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</a></b>. </p> +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 package you want to install:</p> +<p>Then, select which SDK bundle you want to install:</p> <div class="cols" style="margin:30px 0 60px"> -<div class="col-4" style="margin-left:0"> -<a href="{@docRoot}sdk/installing/index.html?pkg=adt" class="landing-button landing-secondary"> -Eclipse ADT -</a> -</div> <div class="col-4"> <a href="{@docRoot}sdk/installing/index.html?pkg=studio" class="landing-button landing-secondary"> @@ -353,6 +345,12 @@ Stand-alone SDK Tools </div> </div> +<p></p> + +<div> +<p></p> + +</div> </div> <!-- ################ END DEFAULT ##################### --> |