summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/sdk')
-rw-r--r--docs/html/sdk/index.jd5
-rw-r--r--docs/html/sdk/installing/adding-packages.jd6
-rw-r--r--docs/html/sdk/installing/index.jd12
-rw-r--r--docs/html/sdk/installing/studio-tips.jd206
4 files changed, 115 insertions, 114 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 8ad0211..c85df43 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -141,7 +141,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.
@@ -244,7 +244,7 @@ This is the Android Software Development Kit License Agreement
14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
-<em>November 13, 2012</em>
+<em>December 8, 2014</em>
</div>
@@ -298,7 +298,6 @@ width: 400px;text-align: center;">The official Android IDE</p>
<li>Android 5.0 emulator system image with Google APIs</li>
</ul>
-
<a class="online landing-button green download-bundle-button" style="margin-top:30px;"
href="#Other" >Download Android Studio</a>
diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
index 3126c1b..b8d8925 100644
--- a/docs/html/sdk/installing/adding-packages.jd
+++ b/docs/html/sdk/installing/adding-packages.jd
@@ -64,10 +64,10 @@ So before you can start, there are a few packages you should add to your Android
<p>To start adding packages, launch the Android SDK Manager in one of the following ways:</p>
<ul>
- <li>In Android Studio, click <strong>SDK Manager</strong>
+ <li>In Eclipse or Android Studio, click <strong>SDK Manager</strong>
<img src="{@docRoot}images/tools/sdk-manager-studio.png"
style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
- <li>If you're not using Android Studio:
+ <li>If you're not using Eclipse or Android Studio:
<ul>
<li>Windows: Double-click the <code>SDK Manager.exe</code> file at the root of the Android
SDK directory.</li>
@@ -77,7 +77,7 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
</li>
</ul>
-<p>When you open the SDK Manager for the first time, several packages are selected by
+<p>When you open the SDK Manager for the first time, several packages will be selected by
default. Leave these selected, but be sure you have everything you need
to get started by following these steps:</p>
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 9a02382..ee3bd95 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -87,7 +87,7 @@ where they are installed. For example:</p>
<p><b>To set up Android Studio on Mac OSX:</b></p>
<ol>
- <li>Launch the {@code .dmg} file you just downloaded.</li>
+ <li>Unzip the downloaded zip file, {@code android-studio-ide-&lt;version&gt;-mac.zip}.</li>
<li>Drag and drop Android Studio into the Applications folder.
<li>Open Android Studio and follow the setup wizard to install any necessary SDK tools.
<p>
@@ -97,11 +97,13 @@ 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>If you need use the Android SDK tools from a command line,
-you can access them at:</p>
-<p><code>/Users/&lt;user>/Library/Android/sdk/</code></p>
+<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>
</div><!-- end mac -->
@@ -112,7 +114,7 @@ you can access them at:</p>
<p><b>To set up Android Studio on Linux:</b></p>
<ol>
- <li>Unpack the downloaded ZIP file into an
+ <li>Unpack the downloaded Tar file, {@code android-studio-ide-&lt;version&gt;-linux.zip}, 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}.
diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index 69c188c..c3edff6 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -4,16 +4,9 @@ page.title=Android Studio Tips and Tricks
<div id="qv-wrapper">
<div id="qv">
- <h2>In this document</h2>
- <ol>
- <li><a href="#productivity-features">Productivity Features</a></li>
- <li><a href="#intellij">Working with IntelliJ</a></li>
- <li><a href="#key-commands">Key Commands</a></li>
- </ol>
-
<h2>See also</h2>
<ol>
- <li><a href="{@docRoot}sdk/index.html">Download Android Studio</a></li>
+ <li><a href="{@docRoot}tools/sdk/index.html">Download Android Studio</a></li>
<li><a href="http://wiki.jetbrains.net/intellij/Android">IntelliJ IDEA Android Tutorials</a></li>
<li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA">IntelliJ FAQ on migrating to IntelliJ IDEA</a></li>
</ol>
@@ -26,136 +19,135 @@ provides some tips to help you get started with some of the most common tasks an
enhancements. </p>
-<h2 id="productivity-features">Productivity Features</h2>
+ <h2>Smart Rendering</h2>
+ <p>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 <em>width</em> and
+ <em>height</em> atttributes, Android Studio displays the rendering message <em>Automatically
+ add all missing attributs</em>. Clicking the message adds the missing attributes to the layout.</p>
+
+
+ <h2> Bitmap rendering in the debugger</h2>
+ <p>While debugging, you can now right-click on bitmap variables in your app and invoke
+ <em>View Bitmap</em>. This fetches the associated data from the debugged process and renders
+ the bitmap in the debugger. </p>
+ <p><img src="{@docRoot}images/tools/studio-bitmap-rendering.png" style="width:350px"/></p>
+ <p class="img-caption"><strong>Figure 13.</strong> Bitmap Rendering/p>
+
-<p>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.
-</p>
+ <h2>Output window message filtering</h2>
+ <p>When checking build results, you can filter messages by <em>message type</em> to quickly
+ locate messages of interest.</p>
+ <img src="{@docRoot}images/tools/studio-outputwindowmsgfiltering.png" style="width:200px"style="width:200px" />
+ <p class="img-caption"><strong>Figure 14.</strong> Filter Build Messages</p>
-<h3>Smart Rendering</h3>
-<p>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 <em>width</em> and
-<em>height</em> atttributes, Android Studio displays the rendering message <em>Automatically
-add all missing attributs</em>. Clicking the message adds the missing attributes to the layout.</p>
+ <h2>Hierarchical parent setting</h2>
+ <p>The activity parent can now be set in the Activity Wizard when creating a new
+ activity. Setting a <em>hierarchal parent</em> 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 <em>menu.xml</em> file.</p>
-<h3> Bitmap rendering in the debugger</h3>
-<p>While debugging, you can now right-click on bitmap variables in your app and invoke
-<em>View Bitmap</em>. This fetches the associated data from the debugged process and renders
-the bitmap in the debugger. </p>
-<p><img src="{@docRoot}images/tools/studio-bitmap-rendering.png" style="width:350px"/></p>
-<p class="img-caption"><strong>Figure 1.</strong> Bitmap Rendering</p>
+ <h2>Creating layouts</h2>
+ <p>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.</p>
-<h3>Output window message filtering</h3>
-<p>When checking build results, you can filter messages by <em>message type</em> to quickly
-locate messages of interest.</p>
-<img src="{@docRoot}images/tools/studio-outputwindowmsgfiltering.png" style="width:200px"style="width:200px" />
-<p class="img-caption"><strong>Figure 2.</strong> Filter Build Messages</p>
+ <p>While editing in the <strong>Text</strong> view, you can preview the layout on devices by
+ opening the <strong>Preview</strong> 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 <strong>Preview All Screen Sizes</strong> from the
+ device drop-down.</p>
+ <p><img src="{@docRoot}images/tools/studio-previewall.png" style="width:350px"/></p>
+ <p class="img-caption"><strong>Figure 15.</strong> Preview All Screens/p>
+ <p>You can switch to the graphical editor by clicking <strong>Design</strong> 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 <strong>Palette</strong> on the left side of the
+ window. Clicking <strong>Designer</strong> 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.</p>
-<h3>Hierarchical parent setting</h3>
-<p>The activity parent can now be set in the Activity Wizard when creating a new
-activity. Setting a <em>hierarchal parent</em> 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 <em>menu.xml</em> file.</p>
+ <h2 id="intellij">Working with IntelliJ</h3>
-<h3>Creating layouts</h3>
-<p>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.</p>
+ <p>This section list just a few of the code editing
+ practices you should consider using when creating Android Studio apps. </p>
-<p>While editing in the <strong>Text</strong> view, you can preview the layout on devices by
-opening the <strong>Preview</strong> 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 <strong>Preview All Screen Sizes</strong> from the
-device drop-down.</p>
-<p><img src="{@docRoot}images/tools/studio-previewall.png" style="width:350px"/></p>
-<p class="img-caption"><strong>Figure 3.</strong> Preview All Screens</p>
+ <p>For complete user documentation for the IntelliJ IDEA interface (upon which Android Studio
+ is based), refer to the
+ <a href="http://www.jetbrains.com/idea/documentation/index.jsp">IntelliJ IDEA documentation</a>.</p>
-<p>You can switch to the graphical editor by clicking <strong>Design</strong> 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 <strong>Palette</strong> on the left side of the
-window. Clicking <strong>Designer</strong> 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.</p>
-<h2 id="intellij">Working with IntelliJ</h3>
+ <h3><em>Alt + Enter</em> key binding</h3>
+ <p>For quick fixes to coding errors, the IntelliJ powered IDE implements the <em>Alt + Enter</em>
+ key binding to fix errors (missing imports, variable assignments, missing references, etc) when
+ possible, and if not, suggest the most probable solution. </p>
-<p>This section list just a few of the code editing
-practices you should consider using when creating Android Studio apps. </p>
-<p>For complete user documentation for the IntelliJ IDEA interface (upon which Android Studio
-is based), refer to the
-<a href="http://www.jetbrains.com/idea/documentation/index.jsp">IntelliJ IDEA documentation</a>.</p>
+ <h3><em>Ctrl + D</em> key binding</h3>
+ <p>The <em>Ctrl + D</em> key binding is great for quickly duplicating code lines or fragments.
+ Simply select the desired line or fragment and enter this key binding. </p>
+ <h3>Navigate menu</h3>
+ <p>In case you're not familiar with an API class, file or symbol, the <em>Navigate</em> menu lets
+ you jump directly to the class of a method or field name without having to search through
+ individual classes. </p>
-<h3><em>Alt + Enter</em> key binding</h3>
-<p>For quick fixes to coding errors, the IntelliJ powered IDE implements the <em>Alt + Enter</em>
-key binding to fix errors (missing imports, variable assignments, missing references, etc) when
-possible, and if not, suggest the most probable solution. </p>
+ <h3>Inspection scopes</h3>
+ <p>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. </p>
-<h3><em>Ctrl + D</em> key binding</h3>
-<p>The <em>Ctrl + D</em> key binding is great for quickly duplicating code lines or fragments.
-Simply select the desired line or fragment and enter this key binding. </p>
-<h3>Navigate menu</h3>
-<p>In case you're not familiar with an API class, file or symbol, the <em>Navigate</em> menu lets
-you jump directly to the class of a method or field name without having to search through
-individual classes. </p>
+ <h3>External annotations</h3>
+ <p>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.</p>
-<h3>Inspection scopes</h3>
-<p>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. </p>
+ <h3>Injecting languages</h3>
+ <p>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 statments.</p>
-<h3>External annotations</h3>
-<p>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.</p>
+ <h3>Code folding</h3>
+ <p>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 clas can be later expanded for
+ updates. </p>
-<h3>Injecting languages</h3>
-<p>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 statments.</p>
+ <h3>Image and color preview</h3>
+ <p>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 <em>dp</em> settings. </p>
-<h3>Code folding</h3>
-<p>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 clas can be later expanded for
-updates. </p>
+ <h3>Quick F1 documentation</h3>
+ <p>You can now inspect theme attributes using <strong>View > Quick Documentation</strong>
+ (<strong>F1</strong>),
+ see the theme inheritance hierarchy, and resolve values for the various attributes.</p>
-<h3>Image and color preview</h3>
-<p>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 <em>dp</em> settings. </p>
+ <p>If you invoke <strong> View > Quick Documentation</strong> (usually bound to F1) on the theme
+ attribute <em>?android:textAppearanceLarge</em>, you will see the theme inheritance hierarchy and
+ resolved values for the various attributes that are pulled in.</p>
-<h3>Quick F1 documentation</h3>
-<p>You can now inspect theme attributes using <strong>View > Quick Documentation</strong>
-(<strong>F1</strong>),
-see the theme inheritance hierarchy, and resolve values for the various attributes.</p>
-<p>If you invoke <strong> View > Quick Documentation</strong> (usually bound to F1) on the theme
-attribute <em>?android:textAppearanceLarge</em>, you will see the theme inheritance hierarchy and
-resolved values for the various attributes that are pulled in.</p>
+ <h3>New Allocation Tracker integration in the Android/DDMS window</h3>
+ <p>You can now inspect theme attributes using <strong> View > Quick Documentation
+ </strong> <code>F1</code>, see the theme inheritance hierarchy, and resolved values for the
+ various attributes.</p>
+ <img src="{@docRoot}images/tools/studio-allocationtracker.png" style="width:300px" />
+ <p class="img-caption"><strong>Figure 16</strong> Allocation Tracker</p>
-<h3>New Allocation Tracker integration in the Android/DDMS window</h3>
-<p>You can now inspect theme attributes using <strong> View > Quick Documentation
-</strong> <code>F1</code>, see the theme inheritance hierarchy, and resolved values for the
-various attributes.</p>
-<img src="{@docRoot}images/tools/studio-allocationtracker.png" style="width:300px" />
-<p class="img-caption"><strong>Figure 4.</strong> Allocation Tracker</p>
<h3 id="key-commands">Keyboard Commands</h3>
@@ -260,5 +252,13 @@ using Mac OS X, update your keymap to use the Mac OS X 10.5+ version keymaps und
</table>
<p>For a complete keymap reference guide, see the
-<a href="http://www.jetbrains.com/idea/documentation/index.jsp">IntelliJ IDEA</a>
-documentation.</p>
+<a href="http://www.jetbrains.com/idea/documentation/index.jsp">IntelliJ IDEA</a> documentation.</p>
+
+
+</div>
+
+
+</div>
+
+
+