diff options
Diffstat (limited to 'docs/html/sdk')
| -rw-r--r-- | docs/html/sdk/index.jd | 84 | ||||
| -rw-r--r-- | docs/html/sdk/installing/index.jd | 118 | ||||
| -rw-r--r-- | docs/html/sdk/installing/studio.jd | 2 |
3 files changed, 100 insertions, 104 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index a646795..cdbed81 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -2,7 +2,7 @@ page.title=Android SDK page.tags=download page.template=sdk header.hide=1 -page.metaDescription=Download the official Android SDK to develop apps for Android-powered devices. +page.metaDescription=Download the official Android developer tools to develop apps for Android-powered devices. sdk.version=23.0.2 @@ -57,7 +57,7 @@ sdk.win_installer_checksum=7be4b9c230341e1fb57c0f84a8df3994 -<div style="position:relative;height:660px;"> +<div style="position:relative;height:460px;"> <div class="wrap" id="tos" style="position:absolute;display:none;width:inherit;"> @@ -67,7 +67,7 @@ sdk.win_installer_checksum=7be4b9c230341e1fb57c0f84a8df3994 -<p class="sdk-terms-intro">Before installing the Android SDK, you must agree to the following terms and conditions.</p> +<p class="sdk-terms-intro">Before installing the Android Studio or the standlone Android SDK, you must agree to the following terms and conditions.</p> <div class="sdk-terms" onfocus="this.blur()"> <h2 class="norule">Terms and Conditions</h2> @@ -96,7 +96,7 @@ This is the Android Software Development Kit License Agreement 3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. -3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. +3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. 3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK. @@ -240,70 +240,66 @@ This is the Android Software Development Kit License Agreement <div class="col-6" style="margin-left:0"> -<h1 style="margin-top:0">Get the Android SDK</h1> +<h1 style="margin-top:0">Android Developer Tools</h1> -<p>The Android SDK provides the API libraries and developer tools necessary to build, test, - and debug apps for Android.</p> - -<p>Download the ADT Bundle to quickly start developing apps. It includes the essential Android -SDK components and a version of the Eclipse IDE with built-in <b>ADT (Android Developer Tools)</b> -to streamline your Android app development.</p> - -<!-- this appears when viewing the online docs --> -<div class="online" style="margin-bottom:85px"> - -<a class="big button subtitle" id="download-bundle-button" -href="" style="width:295px;display:block;margin:25px 0" ></a> - -<p id="not-supported">Choose the SDK package for your OS from the table below.</p> +<p>The Android SDK provides the API libraries and developer tools necessary to build, test, +and debug apps for Android.</p> +<p>Android Studio is the new official Android IDE, and with a single download includes everything +you need to begin developing Android apps:</p> - <p>With a single download, the Eclipse ADT bundle -includes everything you need to begin developing apps:</p> <ul> -<li>Eclipse + ADT plugin</li> +<li>IntelliJ IDE + Android Studio plugin</li> <li>Android SDK Tools</li> <li>Android Platform-tools</li> <li>A version of the Android platform</li> <li>A version of the Android system image for the emulator</li> </ul> +<a class="big button subtitle" id="download-bundle-button" +href="" style="width:235px;display:block;margin:25px 0" ></a> + + +<!-- this appears when viewing the online docs --> +<div class="online" style="margin-bottom:85px"> + +<p id="not-supported">Choose the SDK package for your OS from the table below.</p> </div> <!-- end online --> - <!-- this appears when viewing the offline docs --> <p class="offline"> -To get the ADT Bundle or stand-alone SDK Tools, please visit the web site at <a -href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a> +To get Android Studio or stand-alone SDK Tools, please visit the web site at <a +href="http://developer.android.com/download/index.html">developer.android.com/download/</a> </p> </div><!-- end col-6 (left column) --> +<div class="col-7" style="background: #ddd; + padding: 20px 20px; width:350px; margin:0px 0 0 0px;"> -<div class="col-7" style="margin-right:0;"> - <img src="{@docRoot}images/tools-home.png" alt="" height="347" width="400" /> - + <h3 style="margin-top:0"><strong>Android Studio 1.0 has arrived!</strong> + </h3> -</div><!-- end col-7 --> +<p>Android Studio is the new official Android IDE. Click the button on this page to download +Android Studio. If you are still using Eclipse ADT, +<a href="{@docRoot}tools/eclipse/migrate-adt.html">consider migrating to Android Studio</a>.</p> </div> +<div class="col-7" style="margin-right:0;"> + <img src="{@docRoot}images/tools/laptop-studio.png" alt="" height="327" width="370" /> -<div class="col-7" style="background: #ddd; - padding: 30px 20px; width:350px; margin:20px 0 0 20px;"> - <h3 style="margin-top:0"> - <a href="/sdk/installing/studio.html">Get Android Studio Beta</a> - </h3> +</div><!-- end col-7 --> <p> Android Studio is a new IDE powered by IntelliJ that provides new features and improvements - over ADT. It's currently in beta but will be the official Android IDE once it's ready.</p> + over ADT. It is the official Android IDE.</p> <p> If you're a new Android developer, you should consider starting with Android Studio, because the ADT plugin for Eclipse is no longer in active development.</p> @@ -312,16 +308,12 @@ href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a </div> - - <!-- alternative SDK options --> <div class="col-13" style="margin:-70px 0 0;"> -<p style="width:340px">If you prefer to use an existing version of Eclipse or another IDE, -you can instead download the stand-alone Android SDK Tools:</p> - - +<p style="width:340px">If you prefer to use another IDE or run the tools from the +command line or build scripts, you can instead download the stand-alone Android SDK Tools:</p> <h4 id="ExistingIDE"><a href='' class="expandable" @@ -330,11 +322,13 @@ you can instead download the stand-alone Android SDK Tools:</p> <div class="col-13 myide" style="margin:0 0 15px;display:none;"> -<p>If you already have an IDE you want to use for Android app development, -setting up a new SDK requires that you download the SDK Tools, then +<p>If you want to use an IDE other than IntelliJ or run Android SDK tools from +the command line or build scripts, +setting up a new SDK requires that you download the Android SDK Tools, then select additional Android SDK packages to install (such as the Android platform -and system image). If you'll be using an existing version of Eclipse, then you can add -the ADT plugin to it.</p> +and system image). +</p> + <p> <a class="button subtitle" id="download-tools-button" href="" style="display:none" ></a> </p> diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 68f4eb7..1dc268b 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"> @@ -79,10 +33,7 @@ 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" -><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 -install</a> instructions.</p> +><b>download Android Studio now</b></a>.</p> <p>Before you set up Android Studio, be sure you have installed @@ -239,7 +190,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 @@ -322,6 +273,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}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 ##################### --> + + + + + + <!-- ################ DEFAULT ##################### --> @@ -329,16 +326,11 @@ 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 or the stand-alone SDK Tools</a></b>. </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,16 @@ Stand-alone SDK Tools </div> </div> +<p></p> + +<div> +<p></p> +<p>If you are still using Eclipse ADT, you can still <a href="{@docRoot}sdk/index.html">download</a> +and <a href="{@docRoot}sdk/installing/index.html?pkg=adt">install </a> the current release. +However, <a href="{@docRoot}tools/eclipse/migrate-adt.html">consider migrating to Android Studio</a> +as the Eclipse ADT plugin is no longer in active development.</p> + +</div> </div> <!-- ################ END DEFAULT ##################### --> diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd index 6829354..0c55f98 100644 --- a/docs/html/sdk/installing/studio.jd +++ b/docs/html/sdk/installing/studio.jd @@ -1,7 +1,7 @@ page.title=Android Studio page.tags="studio" page.image=images/resource-card-android-studio.png -page.metaDescription=Learn about the new features in the beta release of our new IDE. +page.metaDescription=Learn about the new features in Android Studio. @jd:body |