Before installing the Android SDK, you must agree to the following terms and conditions.
+Before installing the Android Studio or the standlone Android SDK, you must agree to the following terms and conditions.
Terms and Conditions
@@ -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 AgreementGet the Android SDK
+Android Developer Tools
+The Android SDK provides the API libraries and developer tools necessary to build, test, - and debug apps for Android.
+and debug apps for Android. -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 ADT (Android Developer Tools) -to streamline your Android app development.
+Android Studio is the new official Android IDE, and with a single download includes everything +you need to begin developing Android apps:
- - -Choose the SDK package for your OS from the table below.
- - -With a single download, the Eclipse ADT bundle -includes everything you need to begin developing apps:
-
-
- Eclipse + ADT plugin +
- IntelliJ IDE + Android Studio plugin
- Android SDK Tools
- Android Platform-tools
- A version of the Android platform
- A version of the Android system image for the emulator
Choose the SDK package for your OS from the table below.
-To get the ADT Bundle or stand-alone SDK Tools, please visit the web site at developer.android.com/sdk/ +To get Android Studio or stand-alone SDK Tools, please visit the web site at developer.android.com/download/
Android Studio 1.0 has arrived! +
+ +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, +consider migrating to Android Studio.
+ 
- Get Android Studio Beta -
-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.
+ over ADT. It is the official Android IDE.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.
@@ -312,16 +308,12 @@ href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/ - -If you prefer to use an existing version of Eclipse or another IDE, -you can instead download the stand-alone Android SDK Tools:
- - +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:
-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
+
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.
+and system image).
+
+
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 6a99952319df5..8eae230956fc8 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -25,52 +25,6 @@ p.paging-links {
-
-
-
-
-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.
-
-If you didn't download the Eclipse ADT bundle, go download the Eclipse ADT bundle now, or switch to the
-Android Studio
-install or stand-alone SDK Tools
-install instructions.
-
-
-To set up the ADT Bundle:
-
-- 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.
-- Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch
-Eclipse.
-
-
-Caution: 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.
-
-
-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.
-
-
-
-
-
-
-
-
-
-
-
-
@@ -79,10 +33,7 @@ the Android SDK tools and the Android Studio IDE (powered by IntelliJ) to
streamline your Android app development.
If you didn't download Android Studio, go download Android Studio now, or switch to the
-Eclipse ADT
-install or stand-alone SDK Tools
-install instructions.
+>download Android Studio now.
Before you set up Android Studio, be sure you have installed
@@ -160,8 +111,8 @@ the {@code sdk/} directory. For example:
To set up Android Studio on Linux:
- - Unpack the downloaded Tar file, {@code android-studio-bundle-<version>.tgz}, into an appropriate
- location for your applications.
+
- Unpack the downloaded Tar file, {@code android-studio-bundle-<version>.tgz}, into an
+ appropriate location for your applications.
- To launch Android Studio, navigate to the {@code android-studio/bin/} directory
in a terminal and execute {@code studio.sh}.
You may want to add {@code android-studio/bin/} to your PATH environmental
@@ -215,15 +166,15 @@ 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 into a default location (or you can specify the location).
+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 into a default location (or you can
+specify the location).
- Double-click the executable ({@code .exe} file) to start the install.
-- Make a note of the name and location in which it saves the SDK on your system—you will need to
-refer to the SDK directory later when using
-the SDK tools from the command line.
+- Make a note of the name and location in which it saves the SDK on your system—you will
+need to refer to the SDK directory later when using the SDK tools from the command line.
- Once the installation completes, the installer starts the Android SDK Manager.
@@ -237,8 +188,8 @@ 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.
+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
@@ -254,8 +205,8 @@ the SDK tools from the command line.
To get started on Linux:
Unpack the {@code .tgz} file you've downloaded. By default, the SDK files are unpacked
-into a directory named android-sdk-linux_x86. Move it to an appropriate location on your machine,
-such as a "Development" directory in your home directory.
+into a directory named android-sdk-linux_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
@@ -321,6 +272,52 @@ Continue: Adding SDK Packages
+
+
+
+
+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.
+
+If you didn't download the Eclipse ADT bundle, go download the Eclipse ADT bundle now, or switch to the
+Android Studio
+install or stand-alone SDK Tools
+install instructions.
+
+
+To set up the ADT Bundle:
+
+- 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.
+- Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch
+Eclipse.
+
+
+Caution: 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.
+
+
+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.
+
+
+
+
+
+
+
+
+
+
+
+
@@ -328,16 +325,11 @@ Continue: Adding SDK Packages
If you haven't already, download
-the Android SDK.
+the Android SDK bundle for Android Studio or the stand-alone SDK Tools.
-Then, select which SDK package you want to install:
+Then, select which SDK bundle you want to install:
+
+
+
+
+If you are still using Eclipse ADT, you can still download
+and install the current release.
+However, consider migrating to Android Studio
+as the Eclipse ADT plugin is no longer in active development.
+
+
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index b0567e7c1b118..7c1998a57a1d7 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
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index 8eb9cbfcc1167..582a3406b39b7 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -1,10 +1,12 @@
+
+
+
-
-
+
- -
+
-
Installing the SDK
-
@@ -13,27 +15,17 @@
- -
-
- Android Studio
-
-
-
+
+
+ -
+
+
+
+
+
+
-
@@ -58,7 +50,7 @@
-
@@ -68,10 +60,10 @@
-
-
-
@@ -83,8 +75,8 @@
Fundamentals
- -
- From Eclipse
+
-
+ From Android Studio
-
From Other IDEs
@@ -123,7 +115,7 @@
-
- - From Eclipse with ADT
+ - From Android Studio
- From Other IDEs
- Using DDMS
- Reading and Writing Logs
@@ -144,29 +136,17 @@
-
+
+
+
+
+
-
-
-
-
-
- -
-
+
- adb
- -
-
-
-
+ - ADT
- android
- AVD Manager
- bmgr
@@ -183,15 +163,12 @@ class="en">Tools Help
- mksdcard
- monkey
-
-
+
- ProGuard
@@ -200,7 +177,8 @@ class="en">MonkeyRunner
- Tracer for OpenGL ES
- Traceview
-
-
+
- Configurator
- IAutomationSupport
@@ -217,30 +195,73 @@ class="en">MonkeyRunner
- zipalign
+
+
+
+
+
+ -
+
+ Build System
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
-
@@ -251,7 +272,26 @@ class="en">Platforms
- ADK 2012 Guide
- ADK 2011 Guide
-
+
+
+
+
+
+
+ -
+
+
+ Eclipse ADT
+
+
+
+
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 +
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.
+and system image). + + diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 6a99952319df5..8eae230956fc8 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -25,52 +25,6 @@ p.paging-links { - -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.
- -If you didn't download the Eclipse ADT bundle, go download the Eclipse ADT bundle now, or switch to the -Android Studio -install or stand-alone SDK Tools -install instructions.
- -To set up the ADT Bundle:
--
-
- 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. -
- Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch -Eclipse. -
Caution: 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.
-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.
- - - - -If you didn't download Android Studio, go download Android Studio now, or switch to the -Eclipse ADT -install or stand-alone SDK Tools -install instructions.
+>download Android Studio now.Before you set up Android Studio, be sure you have installed @@ -160,8 +111,8 @@ the {@code sdk/} directory. For example:
To set up Android Studio on Linux:
-
-
- Unpack the downloaded Tar file, {@code android-studio-bundle-<version>.tgz}, into an appropriate - location for your applications. +
- Unpack the downloaded Tar file, {@code android-studio-bundle-<version>.tgz}, into an + appropriate location for your applications.
- To launch Android Studio, navigate to the {@code android-studio/bin/} directory
in a terminal and execute {@code studio.sh}.
You may want to add {@code android-studio/bin/} to your PATH environmental @@ -215,15 +166,15 @@ 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 into a default location (or you can specify the location).
+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 into a default location (or you can +specify the location).
- Double-click the executable ({@code .exe} file) to start the install. -
- Make a note of the name and location in which it saves the SDK on your system—you will need to -refer to the SDK directory later when using -the SDK tools from the command line. +
- Make a note of the name and location in which it saves the SDK on your system—you will +need to refer to the SDK directory later when using the SDK tools from the command line.
- Once the installation completes, the installer starts the Android SDK Manager.
- 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. +
- Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch +Eclipse. +
-
-
+
-
-
-
+
- Installing the SDK
- @@ -13,27 +15,17 @@
-- -
+ + +- Android Studio -- -- + +
+ + + +@@ -58,7 +50,7 @@- @@ -68,10 +60,10 @@
- -
- @@ -83,8 +75,8 @@ Fundamentals
-- - From Eclipse +
- + From Android Studio
- From Other IDEs @@ -123,7 +115,7 @@
-
-
- From Eclipse with ADT +
- From Android Studio
- From Other IDEs
- Using DDMS
- Reading and Writing Logs @@ -144,29 +136,17 @@
- - - -
- -- - +
- adb -
- - - - +
- ADT
- android
- AVD Manager
- bmgr @@ -183,15 +163,12 @@ class="en">Tools Help
- mksdcard
- monkey
- - +
- ProGuard
@@ -200,7 +177,8 @@ class="en">MonkeyRunner - Tracer for OpenGL ES
- Traceview
-
-
+
- Configurator
- IAutomationSupport @@ -217,30 +195,73 @@ class="en">MonkeyRunner
- zipalign
+
+
+
+
+
+ -
+
-
+ + Build System ++ +
+
+
+
+
+
- + + + + + + +
- - + + + + +
- - + + + + +
-
@@ -251,7 +272,26 @@ class="en">Platforms
- ADK 2012 Guide
- ADK 2011 Guide
- + + + + + + +- +
++ + Eclipse ADT ++ +
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.
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 @@ -254,8 +205,8 @@ the SDK tools from the command line.
To get started on Linux:
Unpack the {@code .tgz} file you've downloaded. By default, the SDK files are unpacked
-into a directory named android-sdk-linux_x86. Move it to an appropriate location on your machine,
-such as a "Development" directory in your home directory.
android-sdk-linux_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 @@ -321,6 +272,52 @@ Continue: Adding SDK Packages
+ +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.
+ +If you didn't download the Eclipse ADT bundle, go download the Eclipse ADT bundle now, or switch to the +Android Studio +install or stand-alone SDK Tools +install instructions.
+ +To set up the ADT Bundle:
+-
+
Caution: 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.
+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.
+ + + + +If you haven't already, download -the Android SDK.
+the Android SDK bundle for Android Studio or the stand-alone SDK Tools. -Then, select which SDK package you want to install:
+Then, select which SDK bundle you want to install:
+ + +If you are still using Eclipse ADT, you can still download +and install the current release. +However, consider migrating to Android Studio +as the Eclipse ADT plugin is no longer in active development.
+ +-
+
+
+