diff --git a/docs/html/images/tools/studio-globe-icon.png b/docs/html/images/tools/studio-globe-icon.png
new file mode 100644
index 0000000000000..0701dd27c9e8a
Binary files /dev/null and b/docs/html/images/tools/studio-globe-icon.png differ
diff --git a/docs/html/images/tools/studio-setup-wizard.png b/docs/html/images/tools/studio-setup-wizard.png
deleted file mode 100644
index ccd92d361739b..0000000000000
Binary files a/docs/html/images/tools/studio-setup-wizard.png and /dev/null differ
diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index 4e732f011be33..7d37b1df95008 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -4,9 +4,16 @@ page.title=Android Studio Tips and Tricks
+
In this document
+
+ - Productivity Shortcuts
+ - Working with IntelliJ
+ - Key Commands
+
+
See also
- - Download Android Studio
+ - Download Android Studio
- IntelliJ IDEA Android Tutorials
- IntelliJ FAQ on migrating to IntelliJ IDEA
@@ -19,170 +26,178 @@ provides some tips to help you get started with some of the most common tasks an
enhancements.
-
Smart Rendering
-
With smart rendering, Android Studio displays links for quick fixes to rendering errors.
- For example, if you add a button to the layout without specifying the width and
- height attributes, Android Studio displays the rendering message Automatically
- add all missing attributes. Clicking the message adds the missing attributes to the layout.
+
Productivity Shortcuts
+
+
Android Studio includes a number of features to help you be more productive in your coding.
+This section notes a few of the key features to help you work quickly and efficiently.
+
-
Bitmap rendering in the debugger
-
While debugging, you can now right-click on bitmap variables in your app and invoke
- View Bitmap. This fetches the associated data from the debugged process and renders
- the bitmap in the debugger.
-
-
Figure 13. Bitmap Rendering/p>
+
Smart Rendering
+
With smart rendering, Android Studio displays links for quick fixes to rendering errors.
+For example, if you add a button to the layout without specifying the width and
+height attributes, Android Studio displays the rendering message Automatically
+add all missing attributes. Clicking the message adds the missing attributes to the layout.
-
Output window message filtering
-
When checking build results, you can filter messages by message type to quickly
- locate messages of interest.
-
-
Figure 14. Filter Build Messages
+
Bitmap rendering in the debugger
+
While debugging, you can now right-click on bitmap variables in your app and invoke
+View Bitmap. This fetches the associated data from the debugged process and renders
+the bitmap in the debugger.
+
+
Figure 1. Bitmap Rendering
-
Hierarchical parent setting
-
The activity parent can now be set in the Activity Wizard when creating a new
- activity. Setting a hierarchal parent sets the {@code Up} button to automatically
- appear in the app's Action bar when viewing a child activity, so the {@code Up}
- button no longer needs to be manually specified in the menu.xml file.
+
Creating new files
+
You can quickly add new code and resource files by clicking the appropriate directory in the
+Project pane and pressing ALT + INSERT on Windows and Linux or
+COMMAND + N on Mac. Based on the type of directory selected, Android Studio
+offers to create the appropriate file type.
+
+
For example, if you select a layout directory, press ALT + INSERT on Windows,
+and select Layout resource file, a dialog opens so you can name the file
+(you can exclude the {@code .xml} suffix) and choose a root view element. The editor then
+switches to the layout design editor so you can begin designing your layout.
-
Creating layouts
-
Android Studio offers an advanced layout editor that allows you to drag-and-drop widgets
- into your layout and preview your layout while editing the XML.
-
-
While editing in the Text view, you can preview the layout on devices by
- opening the Preview pane available on the right side of the window. Within the
- Preview pane, you can modify the preview by changing various options at the top of the pane,
- including the preview device, layout theme, platform version and more. To preview the layout on
- multiple devices simultaneously, select Preview All Screen Sizes from the
- device drop-down.
-
-
Figure 15. Preview All Screens/p>
-
-
You can switch to the graphical editor by clicking Design at the
- bottom of the window. While editing in the Design view, you can show and hide the
- widgets available to drag-and-drop by clicking Palette on the left side of the
- window. Clicking Designer on the right side of the window reveals a panel
- with a layout hierarchy and a list of properties for each view in the layout.
+
Output window message filtering
+
When checking build results, you can filter messages by message type to quickly
+locate messages of interest.
+
+
Figure 2. Filter Build Messages
-
Annotations
-
Android Studio provides coding assistance for using annotations from the
- {@link android.support.annotation Support-Annotations} library, part of the
- Support Repository. Adding a dependency for this library enables you to decorate your code with
- annotations to help catch bugs, such as null pointer exceptions and resource type conflicts.
- You can also create enumerated annotations to, for example, check that a passed parameter value
- matches a value from a defined set of constants. For more information, see
- Improving Code Inspection with
- Annotations.
+
Hierarchical parent setting
+
The activity parent can now be set in the Activity Wizard when creating a new
+activity. Setting a hierarchal parent sets the {@code Up} button to automatically
+appear in the app's Action bar when viewing a child activity, so the {@code Up}
+button no longer needs to be manually specified in the menu.xml file.
-
Java class decompiling
-
Android Studio allows you to look at what’s inside Java libraries when you don’t have access
- to the source code.
+
Creating layouts
+
Android Studio offers an advanced layout editor that allows you to drag-and-drop widgets
+into your layout and preview your layout while editing the XML.
-
The decompiler is built into Android Studio for easy access. To use this feature, right-click
- a class, method, or field from a library for which you do not have source file access and select
- decompile.
The decompiled source code appears.
+
While editing in the Text view, you can preview the layout on devices by
+opening the Preview pane available on the right side of the window. Within the
+Preview pane, you can modify the preview by changing various options at the top of the pane,
+including the preview device, layout theme, platform version and more. To preview the layout on
+multiple devices simultaneously, select Preview All Screen Sizes from the
+device drop-down.
+
+
Figure 3. Preview All Screens
-
To adjust the Java decompiler settings, select
- File > Settings > Other Settings > Java Decompiler.
+
You can switch to the graphical editor by clicking Design at the
+bottom of the window. While editing in the Design view, you can show and hide the
+widgets available to drag-and-drop by clicking Palette on the left side of the
+window. Clicking Designer on the right side of the window reveals a panel
+with a layout hierarchy and a list of properties for each view in the layout.
-
Debugging and performance enhancements
-
Android Studio offers debugging and performance enhancements such as:
-
- - Auto detect an expanded set of code styles. To modify the current code style, choose
- File > Settings > Code Styles.
- - Support for high density (Retina) displays on Windows and Linux.
- - Scratch files for quick prototyping without creating any project files.
-
Choose Tools > New Scratch File to open a scratch file to quickly
- build and run code prototypes. Together with Android Studio coding assistance, scratch
- files allow you to quickly run and debug code updates with the support of all file operations.
- By embedding code created with scripting languages, you can run your code from within the
- scratch file.
-
-
+
Annotations
+
Android Studio provides coding assistance for using annotations from the
+{@link android.support.annotation Support-Annotations} library, part of the
+Support Repository.
+
+Adding a dependency for this library enables you to decorate your code with annotations to help
+catch bugs, such as null pointer exceptions and resource type conflicts. You can also create
+enumerated annotations to, for example, check that a passed parameter value matches a value from
+a defined set of constants. For more information, see
+Improving Code Inspection with
+Annotations.
+
+
+
+
Java class decompiling
+
Android Studio allows you to look at what’s inside Java libraries when you don’t have access
+to the source code.
+
+
The decompiler is built into Android Studio for easy access. To use this feature, right-click
+a class, method, or field from a library for which you do not have source file access and select
+decompile.
The decompiled source code appears.
+
+
To adjust the Java decompiler settings, select
+File > Settings > Other Settings > Java Decompiler.
+
+
+
Debugging and performance enhancements
+
Android Studio offers debugging and performance enhancements such as:
+
+ - Custom keymaps. To modify the current keymap, choose
+ File > Settings > Keymap.
+ - Support for high density (Retina) displays on Windows and Linux.
+ - Scratch files for quick prototyping without creating any project files.
+
Choose Tools > New Scratch File to open a scratch file to quickly
+ build and run code prototypes. Together with Android Studio coding assistance, scratch
+ files allow you to quickly run and debug code updates with the support of all file operations.
+ By embedding code created with scripting languages, you can run your code from within the
+ scratch file.
+
+
-
Working with IntelliJ-based Coding Practices
+
Working with IntelliJ-based Coding Practices
-
This section list just a few of the code editing
- practices you should consider using when creating Android Studio apps.
+
This section list just a few of the code editing
+practices you should consider using when creating Android Studio apps.
-
For complete user documentation for the IntelliJ IDEA interface (upon which Android Studio
- is based), refer to the
- IntelliJ IDEA documentation.
-
-
Alt + Enter key binding
-
For quick fixes to coding errors, the IntelliJ powered IDE implements the Alt + Enter
- key binding to fix errors (missing imports, variable assignments, missing references, etc) when
- possible, and if not, suggest the most probable solution.
+
For complete user documentation for the IntelliJ IDEA interface (upon which Android Studio
+is based), refer to the
+IntelliJ IDEA documentation.
-
Ctrl + D key binding
-
The Ctrl + D key binding is great for quickly duplicating code lines or fragments.
- Simply select the desired line or fragment and enter this key binding.
-
-
Navigate menu
-
In case you're not familiar with an API class, file or symbol, the Navigate menu lets
- you jump directly to the class of a method or field name without having to search through
- individual classes.
+
Alt + Enter key binding
+
For quick fixes to coding errors, the IntelliJ powered IDE implements the Alt + Enter
+key binding to fix errors (missing imports, variable assignments, missing references, etc) when
+possible, and if not, suggest the most probable solution.
-
Inspection scopes
-
Scopes set the color of code segments for easy code identification and location. For example,
- you can set a scope to identify all code related to a specific action bar.
+
Ctrl + D key binding
+
The Ctrl + D key binding is great for quickly duplicating code lines or fragments.
+Simply select the desired line or fragment and enter this key binding.
-
-
External annotations
-
Specify annotations within the code or from an external annotation file. The Android Studio
- IDE keeps track of the restrictions and validates compliance, for example setting the data type
- of a string as not null.
+
Navigate menu
+
In case you're not familiar with an API class, file or symbol, the Navigate menu lets
+you jump directly to the class of a method or field name without having to search through
+individual classes.
-
Injecting languages
-
With language injection, the Android Studio IDE allows you to work with islands of different
- languages embedded in the source code. This extends the syntax, error highlighting and coding
- assistance to the embedded language. This can be especially useful for checking regular expression
- values inline, and validating XML and SQL statements.
-
-
Code folding
-
This allows you to selectively hide and display sections of the code for readability. For
- example, resource expressions or code for a nested class can be folded or hidden in to one line
- to make the outer class structure easier to read. The inner class can be later expanded for
- updates.
+
Inspection scopes
+
Scopes set the color of code segments for easy code identification and location. For example,
+you can set a scope to identify all code related to a specific action bar.
-
Image and color preview
-
When referencing images and icons in your code, a preview of the image or icon appears
- (in actual size at different densities) in the code margin to help you verify the image or icon
- reference. Pressing {@code F1} with the preview image or icon selected displays resource asset
- details, such as the dp settings.
+
Injecting languages
+
With language injection, the Android Studio IDE allows you to work with islands of different
+languages embedded in the source code. This extends the syntax, error highlighting and coding
+assistance to the embedded language. This can be especially useful for checking regular expression
+values inline, and validating XML and SQL statements.
-
Quick F1 documentation
-
You can now inspect theme attributes using View > Quick Documentation
- (F1),
- see the theme inheritance hierarchy, and resolve values for the various attributes.
-
-
If you invoke View > Quick Documentation (usually bound to F1) on the theme
- attribute ?android:textAppearanceLarge, you will see the theme inheritance hierarchy and
- resolved values for the various attributes that are pulled in.
+
Code folding
+
This allows you to selectively hide and display sections of the code for readability. For
+example, resource expressions or code for a nested class can be folded or hidden in to one line
+to make the outer class structure easier to read. The inner class can be later expanded for
+updates.
+
Image and color preview
+
When referencing images and icons in your code, a preview of the image or icon appears
+(in actual size at different densities) in the code margin to help you verify the image or icon
+reference. Pressing {@code F1} with the preview image or icon selected displays resource asset
+details, such as the dp settings.
-
New Allocation Tracker integration in the Android/DDMS window
-
You can now inspect theme attributes using View > Quick Documentation
- F1, see the theme inheritance hierarchy, and resolved values for the
- various attributes.
-
-
Figure 16 Allocation Tracker
+
Quick F1 documentation
+
You can now inspect theme attributes using View > Quick Documentation
+(F1),
+see the theme inheritance hierarchy, and resolve values for the various attributes.
+
+
If you invoke View > Quick Documentation (usually bound to F1) on the theme
+attribute ?android:textAppearanceLarge, you will see the theme inheritance hierarchy and
+resolved values for the various attributes that are pulled in.
@@ -288,13 +303,5 @@ using Mac OS X, update your keymap to use the Mac OS X 10.5+ version keymaps und
For a complete keymap reference guide, see the
-IntelliJ IDEA documentation.
-
-
-
-
-
-
-
-
-
+IntelliJ IDEA
+documentation.
diff --git a/docs/html/tools/building/configuring-gradle.jd b/docs/html/tools/building/configuring-gradle.jd
index 7cca5b4809b9e..73a048b9f075c 100644
--- a/docs/html/tools/building/configuring-gradle.jd
+++ b/docs/html/tools/building/configuring-gradle.jd
@@ -198,6 +198,75 @@ settings from the Android SDK installation. Android Studio adds the module-speci
proguard-rules.pro at the root of the module, where you can add custom ProGuard
rules.
+
+
+Application ID for package identification
+With the Android build system, the applicationId attribute is used to
+uniquely identify application packages for publishing. The application ID is set in the
+android section of the build.gradle file.
+
+
+
+ apply plugin: 'com.android.application'
+
+ android {
+ compileSdkVersion 19
+ buildToolsVersion "19.1"
+
+ defaultConfig {
+ applicationId "com.example.my.app"
+ minSdkVersion 15
+ targetSdkVersion 19
+ versionCode 1
+ versionName "1.0"
+ }
+ ...
+
+
+Note: The applicationId is specified only in your
+{@code build.gradle} file, and not in the AndroidManifest.xml file.
+
+When using build variants, the build system enables you to uniquely identify different
+packages for each product flavors and build types. The application ID in the build type is added as
+a suffix to those specified for the product flavors.
+
+
+ productFlavors {
+ pro {
+ applicationId = "com.example.my.pkg.pro"
+ }
+ free {
+ applicationId = "com.example.my.pkg.free"
+ }
+ }
+
+ buildTypes {
+ debug {
+ applicationIdSuffix ".debug"
+ }
+ }
+ ....
+
+
+The package name must still be specified in the manifest file. It is used in your source code
+to refer to your R class and to resolve any relative activity/service registrations.
+
+
+
+ package="com.example.app">
+
+
+Note: If you have multiple manifests (for example, a product
+flavor specific manifest and a build type manifest), the package name is optional in those manifests.
+If it is specified in those manifests, the package name must be identical to the package name
+specified in the manifest in the src/main/ folder.
+
+For more information about the build files and process, see
+Build System Overview.
+
+
+
The debug and the release versions of the app differ on whether the application can be
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index fa6d98749ff59..5041b8380761b 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -12,9 +12,6 @@ page.tags=studio,sdk,tools,firstapp
Project and File Structure
Android Build System
Debug and Performance
- Installation, Setup, and Update Management
- HTTP Proxy Settings
- Other Highlights
@@ -46,7 +43,6 @@ Android Studio offers:
And much more
-Download Android Studio now.
If you're new to Android Studio or the IntelliJ IDEA interface, this
page provides an introduction to some key Android
@@ -104,6 +100,7 @@ representation. To switch to back to the segregated project view, select Project drop-down.
+
Other Android Studio views
When you use the Project view in Android Studio, you
should notice that the project structure appears different than you may be used to in Eclipse. Each
@@ -140,22 +137,7 @@ and Managing Projects.
-Creating new files
-You can quickly add new code and resource files by clicking the appropriate directory in the
-Project pane and pressing ALT + INSERT on Windows and Linux or
-COMMAND + N on Mac. Based on the type of directory selected, Android Studio
-offers to create the appropriate file type.
-
-For example, if you select a layout directory, press ALT + INSERT on Windows,
-and select Layout resource file, a dialog opens so you can name the file
-(you can exclude the {@code .xml} suffix) and choose a root view element. The editor then
-switches to the layout design editor so you can begin designing your layout.
-
-
-
Android Build System
-
-Android Build System
The Android build system is the toolkit you use to build, test, run and package
your apps. This build system replaces the Ant system used with Eclipse ADT. It can run as an
integrated tool from the Android Studio menu and independently from the command line. You can use
@@ -175,76 +157,11 @@ To configure custom build settings in an Android Studio project, see
Configuring Gradle Builds.
-Application ID for package identification
-With the Android build system, the applicationId attribute is used to
-uniquely identify application packages for publishing. The application ID is set in the
-android section of the build.gradle file.
-
-
-
- apply plugin: 'com.android.application'
-
- android {
- compileSdkVersion 19
- buildToolsVersion "19.1"
-
- defaultConfig {
- applicationId "com.example.my.app"
- minSdkVersion 15
- targetSdkVersion 19
- versionCode 1
- versionName "1.0"
- }
- ...
-
-
-Note: The applicationId is specified only in your
-{@code build.gradle} file, and not in the AndroidManifest.xml file.
-
-When using build variants, the build system enables you to uniquely identify different
-packages for each product flavors and build types. The application ID in the build type is added as
-a suffix to those specified for the product flavors.
-
-
- productFlavors {
- pro {
- applicationId = "com.example.my.pkg.pro"
- }
- free {
- applicationId = "com.example.my.pkg.free"
- }
- }
-
- buildTypes {
- debug {
- applicationIdSuffix ".debug"
- }
- }
- ....
-
-
-The package name must still be specified in the manifest file. It is used in your source code
-to refer to your R class and to resolve any relative activity/service registrations.
-
-
-
- package="com.example.app"
-
-
-Note: If you have multiple manifests (for example, a product
-flavor specific manifest and a build type manifest), the package name is optional in those manifests.
-If it is specified in those manifests, the package name must be identical to the package name
-specified in the manifest in the src/main/ folder.
-
-For more information about the build files and process, see
-Build System Overview.
-
-
-
Debug and Performance
-
+Android Studio provides a number of improvements to assist you in debugging and improving the
+performance of your code, including an improved virtual device management, inline debugging, and
+performance analysis tools.
Android Virtual Device (AVD) Manager
AVD Manager has updated screens with links to help you select the most popular device
@@ -349,7 +266,8 @@ android {
You can also manage inspection profiles and configure inspections within Android Studio.
-Choose File > Settings > Project Settings and expand Editor.
+Choose File > Settings >, expand the Editor options,
+and select Inspections.
The Inspection Configuration page appears with the supported inspections.
Figure 5. Configure inspections.
@@ -505,7 +423,7 @@ the device display.
Log messages
When you build and run your app with Android Studio, you can view adb and device log messages
-(logcat) in the DDMS pane by clicking Android at the bottom of the window.
+(logcat) by clicking Android at the bottom of the window.
If you want to debug your app with the
Android Debug Monitor, you can launch it by
@@ -519,231 +437,4 @@ controlling device behaviors, and more. It also includes the Hierarchy Viewer to
-
Installation, Setup, and Update Management
-
-Android Studio installation and setup wizards
-When you begin the installation process, an installation and setup wizard walks you through
-a step-by-step installation and setup process as the wizard checks for system requirements,
-such as the Java Development Kit (JDK) and available RAM, and then prompts for optional
-installation options, such as the Intel® HAXM emulator accelerator.
-
-During the installation process, a setup wizard walks you through the setup processes as
-the wizard updates your system image and emulation requirements, such GPU, and then creates
-an optimized default Android Virtual Device (AVD) based on Android 5 (Lollipop) for speedy and
-reliable emulation.
-
-Figure 9. Installation and setup wizard.
-
-
-Expanded template and form factor support
-Android Studio supports templates for Google Services and expands the available device
-types.
-
- Android Wear and TV support
- For easy cross-platform development, the Project Wizard provides templates for
- creating your apps for Android Wear and TV.
- 
-
-
Figure 10. Supported form factors.
- During app creation, the Project Wizard also displays an API Level dialog to help you choose
- the best minSdkVersion for your project.
-
-
- Google App Engine integration (Google Cloud Platform/Messaging)
- Quick cloud integration. Using Google App Engine to connect to the Google cloud
- and create a cloud end-point is as easy as selecting File > New Module > App Engine Java
- Servlet Module and specifying the module, package, and client names.
- 
- Figure 11. Google App Engine integration.
-
-
-Easy access to project and file settings
-Android Studio provides setting dialogs so you can manage the most important project and file
-settings from the File menus as well as the build and configuration files. For
-example, you can use the File > Project Structure menu or
-the build.gradle file to update your productFlavor settings.
-Additional settings from the File menus include:
-
- - SDK and JDK location
- - SDK version
- - Gradle and Android Plugin for Gradle versions
- - Build tools version
- - Multidex setting
- - Product flavors
- - Build types
- - Dependencies
-
-
-
-
-
-Update channels
-Android Studio provides four update channels to keep Android Studio up-to-date based on your
-code-level preference:
-
- - Canary channel: Canary builds provide bleeding edge releases, updated
- about weekly. While these builds do get tested, they are still subject to bugs, as we want
- people to see what's new as soon as possible. This is not recommended for production.
- - Dev channel: Dev builds are hand-picked older canary builds that survived
- the test of time. They are updated roughly bi-weekly or monthly.
- - Beta channel: Beta builds are used for beta-quality releases before a
- production release.
- - Stable channel: Used for stable, production-ready versions.
-
-
-
-By default, Android Studio uses the Stable channel. Use
-File > Settings > Updates to change your channel setting.
-
-
-
-Proxy Settings
-Proxies serve as intermediary connection points between HTTP clients and web servers that add
-security and privacy to internet connections.
-
-To support running Android Studio behind a firewall, set the proxy settings for the
-Android Studio IDE and the SDK Manager. Use the Android Studio IDE HTTP Proxy settings page to set
-the HTTP proxy settings for Android Studio. The SDK Manager has a separate HTTP Proxy settings
-page.
-
-When running the Android Plugin for Gradle from the command line or on machines where
-Android Studio is not installed, such as continuous integration servers, set the proxy settings
-in the Gradle build file.
-
-Note: After the initial installation of the Android Studio bundle,
-Android Studio can run with internet access or off-line. However, Android Studio requires an
-internet connection for Setup Wizard synchronization, 3rd-party library access, access to remote
-repositories, Gradle initialization and synchronization, and Android Studio version updates.
-
-
-Setting up the Android Studio Proxy
-Android Studio supports HTTP proxy settings so you can run Android Studio behind a firewall or
-secure network. To set the HTTP proxy settings in Android Studio:
-
- - From the main menu choose File > Settings > Appearance & Behavior -- System
- Settings -- HTTP Proxy.
-
-
- In Android Studio, open the IDE Settings dialog.
-
- - On Windows and Linux, choose
- File > Settings > IDE Setting -- HTTP Proxy.
- - On Mac, choose
- Android Studio > Preferences > IDE Setting -- HTTP Proxy.
-
- The HTTP Proxy page appears.
- - Select auto-detection to use an auto-configuration URL to configure the
- proxy settings or manual to enter each of the settings. For a detailed explanation
- of these settings, see
- HTTP Proxy.
- - Click Apply to enable the proxy settings.
-
-
-Android Plugin for Gradle HTTP proxy settings
-When running the Android Plugin from the command line or on machines where Android Studio is not
-installed, set the Android Plugin for Gradle proxy settings in the Gradle build file.
-
-For application-specific HTTP proxy settings, set the proxy settings in the
-{@code build.gradle} file as required for each application module.
-
-apply plugin: 'com.android.application'
-
-android {
- ...
-
- defaultConfig {
- ...
- systemProp.http.proxyHost=proxy.company.com
- systemProp.http.proxyPort=443
- systemProp.http.proxyUser=userid
- systemProp.http.proxyPassword=password
- systemProp.http.auth.ntlm.domain=domain
- }
- ...
-}
-
-
-
-
-For project-wide HTTP proxy settings, set the proxy settings in the
-gradle/gradle.properties file.
-
-
-# Project-wide Gradle settings.
-...
-
-systemProp.http.proxyHost=proxy.company.com
-systemProp.http.proxyPort=443
-systemProp.http.proxyUser=username
-systemProp.http.proxyPassword=password
-systemProp.http.auth.ntlm.domain=domain
-
-systemProp.https.proxyHost=proxy.company.com
-systemProp.https.proxyPort=443
-systemProp.https.proxyUser=username
-systemProp.https.proxyPassword=password
-systemProp.https.auth.ntlm.domain=domain
-
-...
-
-
-
-For information about using Gradle properties for proxy settings, see the
- Gradle User Guide.
-
-Note: When using Android Studio, the settings in the Android
-Studio IDE HTTP proxy settings page override the HTTP proxy settings in the
-gradle.properties file.
-
-
-
-SDK Manager HTTP Proxy Settings
-SDK Manager proxy settings enable proxy internet access for Android package and library
-updates from SDK Manager packages.
-
-To set the SDK Manager settings for proxy internet access, start the SDK Manager and open the
-SDK Manager page.
-
-
- - On Windows, select Tools > Options from the menu bar.
- - On Mac and Linux, choose Tools > Options from the system menu bar.
-
-
-The Android SDK Manager page appears. Enter the settings and click Apply.
-
-
-
-Other Highlights
-
- Translations Editor
-Multi-language support is enhanced with the Translations Editor plugin so you can easily add
-a variety of locales to the app's translation file. With
-BCP 47 support, the editor combines language and
-region codes into a single selection for targeted localizations. Color codes indicate whether a
-locale is complete or still missing string translations.
-
-To access the Translations Editor, open a strings.xml file and click the
-Open Editor link.
-
- 
- Figure 12. Add locales and strings in the
- Translations Editor.
-
-
- Editor support for the latest Android APIs
-Android Studio supports the
-Material Design themes, widgets, and
-graphics, such as shadow layers and API version rendering (showing the layout across different
-UI versions). Also, the drawable XML tags and attributes, such as <ripple>
-and <animated-selector>, are supported.
-
-
- Easy access to Android code samples on GitHub
-Clicking Import Samples from the File menu or Welcome
-page provides seamless access to Google code samples on GitHub.
- 
- Figure 13. Get code samples from GitHub.
-
- 
- Figure 14. Imported code sample.
-
diff --git a/docs/html/tools/studio/studio-config.jd b/docs/html/tools/studio/studio-config.jd
new file mode 100644
index 0000000000000..f9646b8533d1c
--- /dev/null
+++ b/docs/html/tools/studio/studio-config.jd
@@ -0,0 +1,174 @@
+page.title=Configuration
+page.metaDescription=Learn about the Android Studio configuration.
+page.tags=studio, configuration
+@jd:body
+
+
+
+
+During installation, Android Studio provides wizards and templates that verify your system
+requirements, such as the Java Development Kit (JDK) and available RAM, and configure default
+settings, such as an optimized default Android Virtual Device (AVD) emulation and updated system
+images. This document describes additional configuration settings you may want to use to
+customize your use of Android Studio.
+
+For specific documentation about emulator and device setup and use, see
+Managing Virtual Devices,
+Using Hardware Devices, and
+OEM USB Drivers.
+
+
+
+Update channels
+Android Studio provides four update channels to keep Android Studio up-to-date based on your
+code-level preference:
+
+ - Canary channel: Canary builds provide bleeding edge releases, updated
+ about weekly. While these builds do get tested, they are still subject to bugs, as we want
+ people to see what's new as soon as possible. This is not recommended for production.
+ - Dev channel: Dev builds are hand-picked older canary builds that survived
+ the test of time. They are updated roughly bi-weekly or monthly.
+ - Beta channel: Beta builds are used for beta-quality releases before a
+ production release.
+ - Stable channel: Used for stable, production-ready versions.
+
+
+
+By default, Android Studio uses the Stable channel. Use
+File > Settings > Appearance & Behavior System Settings > Updates to change your
+channel setting.
+
+
+
+Proxy Settings
+Proxies serve as intermediary connection points between HTTP clients and web servers that add
+security and privacy to internet connections.
+
+To support running Android Studio behind a firewall, set the proxy settings for the
+Android Studio IDE and the SDK Manager. Use the Android Studio IDE HTTP Proxy settings page to set
+the HTTP proxy settings for Android Studio. The SDK Manager has a separate HTTP Proxy settings
+page.
+
+When running the Android Plugin for Gradle from the command line or on machines where
+Android Studio is not installed, such as continuous integration servers, set the proxy settings
+in the Gradle build file.
+
+Note: After the initial installation of the Android Studio bundle,
+Android Studio can run with internet access or off-line. However, Android Studio requires an
+internet connection for Setup Wizard synchronization, 3rd-party library access, access to remote
+repositories, Gradle initialization and synchronization, and Android Studio version updates.
+
+
+Setting up the Android Studio Proxy
+Android Studio supports HTTP proxy settings so you can run Android Studio behind a firewall or
+secure network. To set the HTTP proxy settings in Android Studio:
+
+ - From the main menu choose File > Settings > Appearance & Behavior -- System
+ Settings -- HTTP Proxy.
+
+
- In Android Studio, open the IDE Settings dialog.
+
+ - On Windows and Linux, choose
+ File > Settings > IDE Setting -- HTTP Proxy.
+ - On Mac, choose
+ Android Studio > Preferences > IDE Setting -- HTTP Proxy.
+
+ The HTTP Proxy page appears.
+ - Select auto-detection to use an auto-configuration URL to configure the
+ proxy settings or manual to enter each of the settings. For a detailed explanation
+ of these settings, see
+ HTTP Proxy.
+ - Click Apply to enable the proxy settings.
+
+
+Android Plugin for Gradle HTTP proxy settings
+When running the Android Plugin from the command line or on machines where Android Studio is not
+installed, set the Android Plugin for Gradle proxy settings in the Gradle build file.
+
+For application-specific HTTP proxy settings, set the proxy settings in the
+{@code build.gradle} file as required for each application module.
+
+apply plugin: 'com.android.application'
+
+android {
+ ...
+
+ defaultConfig {
+ ...
+ systemProp.http.proxyHost=proxy.company.com
+ systemProp.http.proxyPort=443
+ systemProp.http.proxyUser=userid
+ systemProp.http.proxyPassword=password
+ systemProp.http.auth.ntlm.domain=domain
+ }
+ ...
+}
+
+
+
+
+For project-wide HTTP proxy settings, set the proxy settings in the
+gradle/gradle.properties file.
+
+
+# Project-wide Gradle settings.
+...
+
+systemProp.http.proxyHost=proxy.company.com
+systemProp.http.proxyPort=443
+systemProp.http.proxyUser=username
+systemProp.http.proxyPassword=password
+systemProp.http.auth.ntlm.domain=domain
+
+systemProp.https.proxyHost=proxy.company.com
+systemProp.https.proxyPort=443
+systemProp.https.proxyUser=username
+systemProp.https.proxyPassword=password
+systemProp.https.auth.ntlm.domain=domain
+
+...
+
+
+
+For information about using Gradle properties for proxy settings, see the
+ Gradle User Guide.
+
+Note: When using Android Studio, the settings in the Android
+Studio IDE HTTP proxy settings page override the HTTP proxy settings in the
+gradle.properties file.
+
+
+
+SDK Manager HTTP Proxy Settings
+SDK Manager proxy settings enable proxy internet access for Android package and library
+updates from SDK Manager packages.
+
+To set the SDK Manager settings for proxy internet access, start the SDK Manager and open the
+SDK Manager page.
+
+
+ - On Windows, select Tools > Options from the menu bar.
+ - On Mac and Linux, choose Tools > Options from the system menu bar.
+
+
+The Android SDK Manager page appears. Enter the settings and click Apply.
+
+
+
diff --git a/docs/html/tools/studio/studio-features.jd b/docs/html/tools/studio/studio-features.jd
new file mode 100644
index 0000000000000..76eba1001114a
--- /dev/null
+++ b/docs/html/tools/studio/studio-features.jd
@@ -0,0 +1,123 @@
+page.title=Features
+page.metaDescription=Learn about the Android Studio features.
+page.tags=studio, features
+@jd:body
+
+
+
+
+If you're new to Android Studio or exploring recent updates, this
+page provides an introduction to some key Android Studio features.
+
+For specific Android Studio how-to documentation, see the pages in the Workflow section, such as
+Managing Projects from Android Studio
+and
+Building and Running from Android Studio.
+
+
+
+Translations Editor
+Multi-language support is enhanced with the Translations Editor plugin so you can easily add
+a variety of locales to the app's translation file. With
+BCP 47 support, the editor combines language and
+region codes into a single selection for targeted localizations. Color codes indicate whether a
+locale is complete or still missing string translations.
+
+To access the Translations Editor, open a strings.xml file and click the
+Open Editor link, or click the globe icon
+(
) in the Design layout view.
+
+
+
+ Figure 1. Add locales and strings in the
+ Translations Editor.
+
+
+
+Android Code Samples on GitHub
+Clicking Import Samples from the File menu or Welcome
+page provides seamless access to Google code samples on GitHub.
+
+ Figure 2. Get code samples from GitHub.
+
+
+
+ Figure 3. Imported code sample.
+
+
+
+Expanded Template and Form Factor Support
+Android Studio supports templates for Google Services and expands the available device
+types.
+
+ Android Wear and TV support
+ For easy cross-platform development, the Project Wizard provides templates for
+ creating your apps for Android Wear and TV.
+
+
+
Figure 4. Supported form factors.
+ During app creation, the Project Wizard also displays an API Level dialog to help you choose
+ the best minSdkVersion for your project.
+
+
+ Google App Engine integration (Google Cloud Platform/Messaging)
+ Quick cloud integration. Using Google App Engine to connect to the Google cloud
+ and create a cloud end-point is as easy as selecting File > New Module > App Engine Java
+ Servlet Module and specifying the module, package, and client names.
+
+ Figure 5 Google App Engine integration.
+
+
+Android Studio and Project Settings
+Android Studio provides setting dialogs so you can manage the most important Android Studio and
+project settings from the File > Project Structure and
+File > Settings menus. For example, you can use the
+File > Project Structure menu or
+the build.gradle file to update your productFlavor settings.
+Additional settings from the File > Project Structure menus include:
+
+ - SDK and JDK location
+ - SDK version
+ - Gradle and Android Plugin for Gradle versions
+ - Build tools version
+ - Multidex setting
+ buildTypes - Dependencies
+
+
+
+Use the File > Settings menu to modify the Android Studio or project
+behavior, such a UI themes, system settings, and version control.
+
+
+
+Editor Support for the Latest Android APIs
+Android Studio supports the
+Material Design themes, widgets, and
+graphics, such as shadow layers and API version rendering (showing the layout across different
+UI versions). Also, the drawable XML tags and attributes, such as <ripple>
+and <animated-selector>, are supported.
+
+
+
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index abfa0304bb096..db19d4f5821eb 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -20,6 +20,10 @@
Android Studio
@@ -196,6 +200,68 @@ class="en">Tools Help
+
+
+
+
+
+
+
+