diff options
Diffstat (limited to 'docs')
22 files changed, 584 insertions, 183 deletions
diff --git a/docs/html/guide/components/intents-common.jd b/docs/html/guide/components/intents-common.jd index 05e3133..16965b3 100644 --- a/docs/html/guide/components/intents-common.jd +++ b/docs/html/guide/components/intents-common.jd @@ -1027,7 +1027,7 @@ and include email details such as the recipient and subject using the extra keys <dt><b>MIME Type</b></dt> <dd> <dl> - <dt>{@link org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE} ("text/plain") + <dt><code>"text/plain"</code> <dt><code>"*/*"</code> </dl> </dd> @@ -2447,7 +2447,7 @@ details such as the phone number, subject, and message body using the extra keys <dt><b>MIME Type</b></dt> <dd> <dl> - <dt>{@link org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE} (<code>"text/plain"</code>) + <dt><code>"text/plain"</code> <dt><code>"image/*"</code> <dt><code>"video/*"</code> </dl> @@ -2558,7 +2558,7 @@ and specify the web URL in the intent data.</p> <dt><b>MIME Type</b></dt> <dd> <dl> - <dt>{@link org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE} (<code>"text/plain"</code>) + <dt><code>"text/plain"</code> <dt><code>"text/html"</code> <dt><code>"application/xhtml+xml"</code> <dt><code>"application/vnd.wap.xhtml+xml"</code> diff --git a/docs/html/guide/components/intents-filters.jd b/docs/html/guide/components/intents-filters.jd index 3dec216..0759088 100644 --- a/docs/html/guide/components/intents-filters.jd +++ b/docs/html/guide/components/intents-filters.jd @@ -376,9 +376,7 @@ the intent.</p> Intent sendIntent = new Intent(); sendIntent.setAction(Intent.ACTION_SEND); sendIntent.putExtra(Intent.EXTRA_TEXT, textMessage); -sendIntent.setType({@link - org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE - HTTP.PLAIN_TEXT_TYPE}); // "text/plain" MIME type +sendIntent.setType("text/plain"); // Verify that the intent will resolve to an activity if (sendIntent.resolveActivity(getPackageManager()) != null) { diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png Binary files differindex ec89e37..a02fd89 100644 --- a/docs/html/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png Binary files differindex cf0c63d..c309ac5 100644 --- a/docs/html/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png Binary files differindex f226a54..414fad4 100644 --- a/docs/html/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png Binary files differnew file mode 100644 index 0000000..c147a87 --- /dev/null +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png Binary files differindex ded0645..4ce2125 100644 --- a/docs/html/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 124b4e2..a43ba3c 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 88619bd..58a8065 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 dc258db..45d1890 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-<version>-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/<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-<version>-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> + + + diff --git a/docs/html/tools/building/buidling-cmdline-ant.jd b/docs/html/tools/building/buidling-cmdline-ant.jd new file mode 100644 index 0000000..51158de --- /dev/null +++ b/docs/html/tools/building/buidling-cmdline-ant.jd @@ -0,0 +1,381 @@ +page.title=Building and Running from the Command Line +parent.title=Building and Running +parent.link=index.html +@jd:body + + <div id="qv-wrapper"> + <div id="qv"> + <h2>In this document</h2> + <ol> + <li><a href="#DebugMode">Building in Debug Mode</a></li> + <li><a href="#ReleaseMode">Building in Release Mode</a> + <ol> + <li><a href="#ManualReleaseMode">Build unsigned</a></li> + <li><a href="#AutoReleaseMode">Build signed and aligned</a></li> + <li><a href="#OnceBuilt">Once built and signed in release mode</a></li> + </ol> + </li> + <li><a href="#RunningOnEmulator">Running on the Emulator</a></li> + <li><a href="#RunningOnDevice">Running on a Device</a></li> + <li><a href="#Signing">Application Signing</a></li> + <li><a href="#AntReference">Ant Command Reference</a></li> + </ol> + <h2>See also</h2> + <ol> + <li><a href="{@docRoot}tools/devices/managing-avds-cmdline.html">Managing AVDs from +the Command Line</a></li> + <li><a href="{@docRoot}tools/devices/emulator.html">Using the Android +Emulator</a></li> + <li><a href="{@docRoot}tools/publishing/app-signing.html">Signing Your Applications</a></li> + </ol> + </div> + </div> + + <p>There are two ways to build your application using the Ant build script: one for + testing/debugging your application — <em>debug mode</em> — and one for building your + final package for release — <em>release mode</em>. Regardless of which way you build your application, + it must be signed before it can install on an emulator or device—with a debug key when building + in debug mode and with your own private key when building in release mode.</p> + + <p>Whether you're building in debug mode or release mode, you need to use the Ant tool to compile + and build your project. This will create the .apk file that you can install on an emulator or device. + When you build in debug mode, the .apk file is automatically signed by the SDK tools with + a debug key, so it's instantly ready for installation onto an emulator or attached + development device. You cannot distribute an application that is signed with a debug key. + When you build in release mode, the .apk file is <em>unsigned</em>, so you + must manually sign it with your own private key, using Keytool and Jarsigner.</p> + + <p>It's important that you read and understand <a href= + "{@docRoot}tools/publishing/app-signing.html">Signing Your Applications</a>, particularly once + you're ready to release your application and share it with end-users. That document describes the + procedure for generating a private key and then using it to sign your .apk file. If you're just + getting started, however, you can quickly run your applications on an emulator or your own + development device by building in debug mode.</p> + + <p>If you don't have Ant, you can obtain it from the <a href="http://ant.apache.org/">Apache Ant + home page</a>. Install it and make sure it is in your executable PATH. Before calling Ant, you + need to declare the JAVA_HOME environment variable to specify the path to where the JDK is + installed.</p> + + <p class="note"><strong>Note:</strong> When installing JDK on Windows, the default is to install + in the "Program Files" directory. This location will cause <code>ant</code> to fail, because of + the space. To fix the problem, you can specify the JAVA_HOME variable like this: + <pre>set JAVA_HOME=c:\Progra~1\Java\<jdkdir></pre> + + <p>The easiest solution, however, is to install JDK in a non-space directory, for example:</p> + + <pre>c:\java\jdk1.7</pre> + + <h2 id="DebugMode">Building in Debug Mode</h2> + + <p>For immediate application testing and debugging, you can build your application in debug mode + and immediately install it on an emulator. In debug mode, the build tools automatically sign your + application with a debug key and optimize the package with {@code zipalign}.</p> + + <p>To build in debug mode:</p> + + <ol> + <li>Open a command-line and navigate to the root of your project directory.</li> + <li>Use Ant to compile your project in debug mode: + <pre> +ant debug +</pre> + + <p>This creates your debug <code>.apk</code> file inside the project <code>bin/</code> directory, named + <code><your_project_name>-debug.apk</code>. The file is already signed with + the debug key and has been aligned with + <a href="{@docRoot}tools/help/zipalign.html"><code>zipalign</code></a>. + </p> + </li> + </ol> + + <p>Each time you change a source file or resource, you must run Ant again in order to package up + the latest version of the application.</p> + + <p>To install and run your application on an emulator, see the following section about <a href= + "#RunningOnEmulator">Running on the Emulator</a>.</p> + + <h2 id="ReleaseMode">Building in Release Mode</h2> + + <p>When you're ready to release and distribute your application to end-users, you must build your + application in release mode. Once you have built in release mode, it's a good idea to perform + additional testing and debugging with the final .apk.</p> + + <p>Before you start building your application in release mode, be aware that you must sign the + resulting application package with your private key, and should then align it using the {@code + zipalign} tool. There are two approaches to building in release mode: build an unsigned package + in release mode and then manually sign and align the package, or allow the build script to sign + and align the package for you.</p> + + <h3 id="ManualReleaseMode">Build unsigned</h3> + + <p>If you build your application <em>unsigned</em>, then you will need to manually sign and align + the package.</p> + + <p>To build an <em>unsigned</em> .apk in release mode:</p> + + <ol> + <li>Open a command-line and navigate to the root of your project directory.</li> + + <li>Use Ant to compile your project in release mode: + <pre> +ant release +</pre> + </li> + </ol> + + <p>This creates your Android application .apk file inside the project <code>bin/</code> + directory, named <code><em><your_project_name></em>-unsigned.apk</code>.</p> + + <p class="note"><strong>Note:</strong> The .apk file is <em>unsigned</em> at this point and can't + be installed until signed with your private key.</p> + + <p>Once you have created the unsigned .apk, your next step is to sign the .apk with your private + key and then align it with {@code zipalign}. To complete this procedure, read <a href= + "{@docRoot}tools/publishing/app-signing.html">Signing Your Applications</a>.</p> + + <p>When your <code>.apk</code> has been signed and aligned, it's ready to be distributed to end-users. + You should test the final build on different devices or AVDs to ensure that it + runs properly on different platforms.</p> + + <h3 id="AutoReleaseMode">Build signed and aligned</h3> + + <p>If you would like, you can configure the Android build script to automatically sign and align + your application package. To do so, you must provide the path to your keystore and the name of + your key alias in your project's {@code ant.properties} file. With this information provided, + the build script will prompt you for your keystore and alias password when you build in release + mode and produce your final application package, which will be ready for distribution.</p> + + <p class="caution"><strong>Caution:</strong> Due to the way Ant handles input, the password that + you enter during the build process <strong>will be visible</strong>. If you are concerned about + your keystore and alias password being visible on screen, then you may prefer to perform the + application signing manually, via Jarsigner (or a similar tool). To instead perform the signing + procedure manually, <a href="#ManualReleaseMode">build unsigned</a> and then continue with + <a href="{@docRoot}tools/publishing/app-signing.html">Signing Your Applications</a>.</p> + + <p>To specify your keystore and alias, open the project {@code ant.properties} file (found in + the root of the project directory) and add entries for {@code key.store} and {@code key.alias}. + For example:</p> + <pre> +key.store=path/to/my.keystore +key.alias=mykeystore +</pre> + + <p>Save your changes. Now you can build a <em>signed</em> .apk in release mode:</p> + + <ol> + <li>Open a command-line and navigate to the root of your project directory.</li> + + <li>Use Ant to compile your project in release mode: + <pre> +ant release +</pre> + </li> + + <li>When prompted, enter you keystore and alias passwords. + + <p class="caution"><strong>Caution:</strong> As described above, your password will be + visible on the screen.</p> + </li> + </ol> + + <p>This creates your Android application .apk file inside the project <code>bin/</code> + directory, named <code><em><your_project_name></em>-release.apk</code>. This .apk file has + been signed with the private key specified in {@code ant.properties} and aligned with {@code + zipalign}. It's ready for installation and distribution.</p> + + <h3 id="OnceBuilt">Once built and signed in release mode</h3> + + <p>Once you have signed your application with a private key, you can install and run it on an + <a href="#RunningOnEmulator">emulator</a> or <a href="#RunningOnDevice">device</a>. You can + also try installing it onto a device from a web server. Simply upload the signed .apk to a web + site, then load the .apk URL in your Android web browser to download the application and begin + installation. (On your device, be sure you have enabled + <em>Settings > Applications > Unknown sources</em>.)</p> + + <h2 id="RunningOnEmulator">Running on the Emulator</h2> + + <p>Before you can run your application on the Android Emulator, you must <a href= + "{@docRoot}tools/devices/managing-avds.html">create an AVD</a>.</p> + + <p>To run your application:</p> + + <ol> + <li> + <strong>Open the AVD Manager and launch a virtual device</strong> + + <p>From your SDK's <code>platform-tools/</code> directory, execute the {@code android} tool +with the <code>avd</code> options:</p> + <pre> +android avd +</pre> + + <p>In the <em>Virtual Devices</em> view, select an AVD and click <strong>Start</strong>.</p> + </li> + + <li> + <strong>Install your application</strong> + + <p>From your SDK's <code>tools/</code> directory, install the {@code .apk} on the + emulator:</p> + <pre> +adb install <em><path_to_your_bin></em>.apk +</pre> + + <p>Your .apk file (signed with either a release or debug key) is in your project {@code bin/} + directory after you build your application.</p> + + <p>If there is more than one emulator running, you must specify the emulator upon which to + install the application, by its serial number, with the <code>-s</code> option. For + example:</p> + <pre> +adb -s emulator-5554 install <em>path/to/your/app</em>.apk +</pre> + + <p>To see a list of available device serial numbers, execute {@code adb devices}.</p> + </li> + </ol> + + <p>If you don't see your application on the emulator, try closing the emulator and launching the + virtual device again from the AVD Manager. Sometimes when you install an application for the + first time, it won't show up in the application launcher or be accessible by other applications. + This is because the package manager usually examines manifests completely only on emulator + startup.</p> + + <p>Be certain to create multiple AVDs upon which to test your application. You should have one + AVD for each platform and screen type with which your application is compatible. For instance, if + your application compiles against the Android 4.0 (API Level 14) platform, you should create an + AVD for each platform equal to and greater than 4.0 and an AVD for each <a href= + "{@docRoot}guide/practices/screens_support.html">screen type</a> you support, then test your + application on each one.</p> + + <p class="note"><strong>Tip:</strong> If you have <em>only one</em> emulator running, you can + build your application and install it on the emulator in one simple step. Navigate to the root of + your project directory and use Ant to compile the project with <em>install mode</em>: <code>ant + install</code>. This will build your application, sign it with the debug key, and install it on + the currently running emulator.</p> + + <h2 id="RunningOnDevice">Running on a Device</h2> + + <p>Before you can run your application on a device, you must perform some basic setup for your + device:</p> + + <ul> + <li>Enable <strong>USB debugging</strong> on your device. + <ul> + <li>On most devices running Android 3.2 or older, you can find the option under + <strong>Settings > Applications > Development</strong>.</li> + <li>On Android 4.0 and newer, it's in <strong>Settings > Developer options</strong>. + <p class="note"><strong>Note:</strong> On Android 4.2 and newer, <strong>Developer + options</strong> is hidden by default. To make it available, go + to <strong>Settings > About phone</strong> and tap <strong>Build number</strong> + seven times. Return to the previous screen to find <strong>Developer options</strong>.</p> + </li> + </ul> + </li> + + <li>Ensure that your development computer can detect your device when connected via USB</li> + </ul> + + <p>Read <a href="{@docRoot}tools/device.html#setting-up">Setting up a Device for + Development</a> for more information.</p> + + <p>Once your device is set up and connected via USB, navigate to your SDK's <code>platform-tools/</code> + directory and install the <code>.apk</code> on the device:</p> + <pre> +adb -d install <em>path/to/your/app</em>.apk +</pre> + + <p>The {@code -d} flag specifies that you want to use the attached device (in case you also have + an emulator running).</p> + + <p>For more information on the tools used above, please see the following documents:</p> + + <ul> + <li><a href="{@docRoot}tools/help/android.html">android Tool</a></li> + + <li><a href="{@docRoot}tools/devices/emulator.html">Android Emulator</a></li> + + <li><a href="{@docRoot}tools/help/adb.html">Android Debug Bridge</a> (ADB)</li> + </ul> + + <h2 id="Signing">Application Signing</h2> + + <p>As you begin developing Android applications, understand that all Android applications must be + digitally signed before the system will install them on an emulator or device. There are two ways + to do this: with a <em>debug key</em> (for immediate testing on an emulator or development + device) or with a <em>private key</em> (for application distribution).</p> + + <p>The Android build tools help you get started by automatically signing your .apk files with a + debug key at build time. This means that you can compile your application and install it on the + emulator without having to generate your own private key. However, please note that if you intend + to publish your application, you <strong>must</strong> sign the application with your own private + key, rather than the debug key generated by the SDK tools.</p> + + <p>The ADT plugin helps you get started quickly by signing your .apk files with a debug key, + prior to installing them on an emulator or development device. This means that you can quickly + run your application from Eclipse without having to generate your own private key. No specific + action on your part is needed, provided ADT has access to Keytool. However, please note that if + you intend to publish your application, you <strong>must</strong> sign the application with your + own private key, rather than the debug key generated by the SDK tools.</p> + + <p>Please read <a href="{@docRoot}tools/publishing/app-signing.html">Signing Your + Applications</a>, which provides a thorough guide to application signing on Android and what it + means to you as an Android application developer. The document also includes a guide to exporting + and signing your application with the ADT's Export Wizard.</p> + + <h2 id="AntReference">Ant Command Reference</h2> + <dt><code>ant clean</code></dt> + <dd>Cleans the project. If you include the <code>all</code> target before <code>clean</code> +(<code>ant all clean</code>), other projects are also cleaned. For instance if you clean a +test project, the tested project is also cleaned.</dd> + + <dt><code>ant debug</code></dt> + <dd>Builds a debug package. Works on application, library, and test projects and compiles + dependencies as needed.</dd> + + <dt id="emma"><code>ant emma debug</code></dt> + <dd>Builds a test project while building the tested project with instrumentation turned on. + This is used to run tests with code coverage enabled.</dd> + + <dt><code>ant release</code></dt> + <dd>Builds a release package.</dd> + + <dt><code>ant instrument</code> + </dt> + <dd>Builds an instrumented debug package. This is generally called automatically when building a + test project with code coverage enabled (with the <code>emma</code> + target)</dd> + + <dt><code>ant <build_target> install</code></dt> + <dd>Builds and installs a package. Using <code>install</code> by itself fails.</dd> + + <dt><code>ant installd</code></dt> + <dd>Installs an already compiled debug package. This fails if the <code>.apk</code> is not + already built.</dd> + + <dt><code>ant installr</code></dt> + <dd>Installs an already compiled release package. This fails if the <code>.apk</code> is not + already built.</dd> + + <dt><code>ant installt</code></dt> + <dd>Installs an already compiled test package. Also installs the <code>.apk</code> of the + tested application. This fails if the <code>.apk</code> is not already built.</dd> + + <dt><code>ant installi</code></dt> + <dd>Installs an already compiled instrumented package. This is generally not used manually as + it's called when installing a test package. This fails if the <code>.apk</code> is not already + built.</dd> + + <dt><code>ant test</code></dt> + <dd>Runs the tests (for test projects). The tested and test <code>.apk</code> files must be + previously installed.</dd> + + <dt><code>ant debug installt test</code></dt> + <dd>Builds a test project and the tested project, installs both <code>.apk</code> files, and + runs the tests.</dd> + + <dt><code>ant emma debug install test</code></dt> + <dd>Builds a test project and the tested project, installs both <code>.apk</code> files, and + runs the tests with code coverage enabled.</dd> + diff --git a/docs/html/tools/building/building-eclipse.jd b/docs/html/tools/building/building-eclipse.jd index 89c3e16..79ef3de 100644 --- a/docs/html/tools/building/building-eclipse.jd +++ b/docs/html/tools/building/building-eclipse.jd @@ -34,12 +34,12 @@ parent.link=index.html <p>This document shows you how to run your application on an emulator or a real device from Eclipse—all of which is done using the debug version of your application. For more information about how to sign your application with a private key for release, see <a href= - "{@docRoot}tools/publishing/app-signing.html#ExportWizard">Signing Your Applications</a></p> + "{@docRoot}tools/workflow/publishing/app-signing.html#ExportWizard">Signing Your Applications</a></p> <h2 id="RunningOnEmulatorEclipse">Running on the emulator</h2> <p>Before you can run your application on the Android Emulator, you must <a href= - "{@docRoot}tools/devices/managing-avds.html">create an AVD</a>.</p> + "{@docRoot}tools/workflow/devices/managing-avds.html">create an AVD</a>.</p> <p>To run (or debug) your application, select <strong>Run</strong> > <strong>Run</strong> (or <strong>Run</strong> > <strong>Debug</strong>) from the Eclipse menu bar. The ADT plugin will @@ -100,7 +100,7 @@ parent.link=index.html <li>Ensure that your development computer can detect your device when connected via USB</li> </ul> - <p>Read <a href="{@docRoot}tools/device.html">Using Hardware Devices</a> + <p>Read <a href="{@docRoot}tools/workflow/devices/device.html">Using Hardware Devices</a> for more information.</p> <p>Once set up and your device is connected via USB, install your application on the device by diff --git a/docs/html/tools/debugging/ddms.jd b/docs/html/tools/debugging/ddms.jd index 1b59875..e9c2877 100644 --- a/docs/html/tools/debugging/ddms.jd +++ b/docs/html/tools/debugging/ddms.jd @@ -246,10 +246,8 @@ TrafficStats.tagSocket(outputSocket); // Transfer data using socket TrafficStats.untagSocket(outputSocket);</pre> -<p>Alternatively, the Apache {@link org.apache.http.client.HttpClient} and -{@link java.net.URLConnection} APIs included in the platform -automatically tag sockets internally based on the active tag (as -identified by +<p>Alternatively, the {@link java.net.URLConnection} APIs included in the platform +automatically tag sockets internally based on the active tag (as identified by {@link android.net.TrafficStats#getThreadStatsTag getThreadStatsTag()}). These APIs correctly tag/untag sockets when recycled through keep-alive pools. In the following example, @@ -258,15 +256,14 @@ sets the active tag to be {@code 0xF00D}. There can only be one active tag per thread. That is the value that will be returned by {@link android.net.TrafficStats#getThreadStatsTag getThreadStatsTag()} -and thus used by {@link org.apache.http.client.HttpClient} - to tag sockets. The {@code finally} statement +and thus used by the HTTP client to tag sockets. The {@code finally} statement invokes {@link android.net.TrafficStats#clearThreadStatsTag clearThreadStatsTag()} to clear the tag.</p> <pre>TrafficStats.setThreadStatsTag(0xF00D); try { - // Make network request using HttpClient.execute() + // Make network request using your http client. } finally { TrafficStats.clearThreadStatsTag(); }</pre> diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd index eaa96d3..1860feb 100644 --- a/docs/html/tools/studio/index.jd +++ b/docs/html/tools/studio/index.jd @@ -101,7 +101,6 @@ representation. To switch to back to the segregated project view, select <strong the <strong>Project</strong> drop-down. </p> - <h3>Android Studio Project and Directory Structure</h3> <p>When you use the <em>Project</em> view of a new project in Android Studio, you should notice that the project structure appears different than you may be used to in Eclipse. Each @@ -574,7 +573,6 @@ provides seamless access to Google code samples on GitHub.</p> <p><img src="{@docRoot}images/tools/studio-samples-githubaccess.png" /></p> <p class="img-caption"><strong>Figure 13.</strong> Code Sample Access</p> - <p><img src="{@docRoot}images/tools/studio-sample-in-editor.png" /></p> <p class="img-caption"><strong>Figure 14.</strong> Imported Code Sample</p> diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs index 62c21a6..fa6328e 100644 --- a/docs/html/tools/tools_toc.cs +++ b/docs/html/tools/tools_toc.cs @@ -1,10 +1,12 @@ <ul id="nav"> + +<!-- Downloads menu--> + <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot -?>sdk/index.html"><span class="en">Download</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot?>sdk/index.html"><span class="en">Download</span></a></div> <ul> - <li><a href="<?cs var:toroot ?>sdk/installing/index.html"> + <li><a href="<?cs var:toroot ?>sdk/installing/index.html"> <span class="en">Installing the SDK</span></a></li> <li><a href="<?cs var:toroot ?>sdk/installing/adding-packages.html"> @@ -16,15 +18,13 @@ <!-- Android Studio menu--> <li class="nav-section"> - <div class="nav-section-header"> - <a href="<?cs var:toroot?>tools/studio/index.html">Android Studio</a> - </div> - <ul> - <li><a href="<?cs var:toroot ?>sdk/installing/studio-tips.html"> - Tips and Tricks</a></li> - </ul> + <div class="nav-section-header"><a href="<?cs var:toroot?>tools/studio/index.html"><span class="en">Android Studio</span></a></div> + <ul> + <li><a href="<?cs var:toroot ?>sdk/installing/studio-tips.html">Tips and Tricks</a> </li> + </ul> + + </li><!-- End of Android Studio Basics --> - </li><!-- End of Android Studio menu --> <!-- Workflow menu--> @@ -70,7 +70,6 @@ <li><a href="<?cs var:toroot ?>tools/building/building-cmdline.html"> <span class="en">From the Command Line</span></a></li> </ul> - </li> <li class="nav-section"> @@ -82,8 +81,8 @@ <a href="<?cs var:toroot?>tools/testing/testing_android.html"> <span class="en">Fundamentals</span></a> </li> - <li><a href="<?cs var:toroot ?>tools/testing/testing_eclipse.html"> - <span class="en">From Eclipse</span></a> + <li><a href="<?cs var:toroot ?>tools/testing/testing_studio.html"> + <span class="en">From Android Studio</span></a> </li> <li><a href="<?cs var:toroot ?>tools/testing/testing_otheride.html"> <span class="en">From Other IDEs</span></a> @@ -143,12 +142,14 @@ </ul> </li> </ul> - </li> + </li><!-- end of debugging --> + +<!-- Tool Help menu--> + <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/index.html"><span -class="en">Tools Help</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/index.html"><span class="en">Tools Help</span></a></div> <ul> <li><a href="<?cs var:toroot ?>tools/help/adb.html">adb</a></li> <li><a href="<?cs var:toroot ?>tools/help/android.html">android</a></li> @@ -167,15 +168,12 @@ class="en">Tools Help</span></a></div> <li><a href="<?cs var:toroot ?>tools/help/mksdcard.html">mksdcard</a></li> <li><a href="<?cs var:toroot ?>tools/help/monkey.html">monkey</a></li> <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot -?>tools/help/monkeyrunner_concepts.html"><span class="en">monkeyrunner</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot?>tools/help/monkeyrunner_concepts.html"> +<span class="en">monkeyrunner</span></a></div> <ul> - <li><a href="<?cs var:toroot ?>tools/help/MonkeyDevice.html"><span -class="en">MonkeyDevice</span></a></li> - <li><a href="<?cs var:toroot ?>tools/help/MonkeyImage.html"><span -class="en">MonkeyImage</span></a></li> - <li><a href="<?cs var:toroot ?>tools/help/MonkeyRunner.html"><span -class="en">MonkeyRunner</span></a></li> + <li><a href="<?cs var:toroot ?>tools/help/MonkeyDevice.html"><span class="en">MonkeyDevice</span></a></li> + <li><a href="<?cs var:toroot ?>tools/help/MonkeyImage.html"><span class="en">MonkeyImage</span></a></li> + <li><a href="<?cs var:toroot ?>tools/help/MonkeyRunner.html"><span class="en">MonkeyRunner</span></a></li> </ul> </li> <li><a href="<?cs var:toroot ?>tools/help/proguard.html" zh-cn-lang="ProGuard">ProGuard</a></li> @@ -184,7 +182,8 @@ class="en">MonkeyRunner</span></a></li> <li><a href="<?cs var:toroot ?>tools/help/gltracer.html">Tracer for OpenGL ES</a></li> <li><a href="<?cs var:toroot ?>tools/help/traceview.html">Traceview</a></li> <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/uiautomator/index.html"><span class="en">uiautomator</span></a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/uiautomator/index.html"> +<span class="en">uiautomator</span></a></div> <ul> <li><a href="<?cs var:toroot ?>tools/help/uiautomator/Configurator.html"><span class="en">Configurator</span></a></li> <li><a href="<?cs var:toroot ?>tools/help/uiautomator/IAutomationSupport.html"><span class="en">IAutomationSupport</span></a></li> @@ -201,7 +200,6 @@ class="en">MonkeyRunner</span></a></li> <li><a href="<?cs var:toroot ?>tools/help/zipalign.html">zipalign</a></li> </ul> </li> - </li><!-- end of tools help --> @@ -234,6 +232,7 @@ class="en">Support Library</span></a></div> </li><!-- end of support library --> + <!-- Revision menu--> <li class="nav-section"> @@ -243,9 +242,10 @@ class="en">Support Library</span></a></div> <li><a href="<?cs var:toroot ?>tools/revisions/studio.html"> <span class="en">Android Studio</span> </a></li> - <li><a href="<?cs var:toroot ?>tools/sdk/tools-notes.html"> + <li><a href="<?cs var:toroot ?>tools/revisions/sdk/tools-notes.html"> <span class="en">SDK Tools</span> </a></li> + </a></li> <li><a href="<?cs var:toroot ?>tools/revisions/build-tools.html"> <span class="en">SDK Build Tools</span> </a></li> @@ -257,13 +257,21 @@ class="en">Support Library</span></a></div> <li><a href="<?cs var:toroot ?>tools/sdk/eclipse-adt.html"> <span class="en">ADT Plugin</span></a></li> </ul> - </li> + </li><!-- end of revision --> + + + +<!-- NDK menu--> <li class="nav-section"> <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>tools/sdk/ndk/index.html">NDK</a> + <a href="<?cs var:toroot ?>tools/ndk/index.html">NDK</a> </div> - </li> + </li><!-- end of NDK --> + + + +<!-- ADK menu--> <li class="nav-section"> <div class="nav-section-header"> @@ -274,7 +282,8 @@ class="en">Support Library</span></a></div> <li><a href="<?cs var:toroot ?>tools/adk/adk2.html">ADK 2012 Guide</a></li> <li><a href="<?cs var:toroot ?>tools/adk/adk.html">ADK 2011 Guide</a></li> </ul> - </li> + </li><!-- end of ADK --> + <!-- Eclipse ADT menu--> diff --git a/docs/html/training/articles/security-gms-provider.jd b/docs/html/training/articles/security-gms-provider.jd index 0d3cf1e..59983cc 100644 --- a/docs/html/training/articles/security-gms-provider.jd +++ b/docs/html/training/articles/security-gms-provider.jd @@ -52,8 +52,7 @@ android.net.SSLCertificateSocketFactory android.net.SSLCertificateSocketFactory}. Rather than using this class, we encourage app developers to use high-level methods for interacting with cryptography. Most apps can use APIs like {@link -javax.net.ssl.HttpsURLConnection}, {@link org.apache.http.client.HttpClient}, -and {@link android.net.http.AndroidHttpClient} without needing to set a custom +javax.net.ssl.HttpsURLConnection} without needing to set a custom {@link javax.net.ssl.TrustManager} or create an {@link android.net.SSLCertificateSocketFactory}.</p> diff --git a/docs/html/training/basics/firstapp/creating-project.jd b/docs/html/training/basics/firstapp/creating-project.jd index 4bd92ee..79268a0 100644 --- a/docs/html/training/basics/firstapp/creating-project.jd +++ b/docs/html/training/basics/firstapp/creating-project.jd @@ -24,6 +24,8 @@ next.link=running-app.html <h2>You should also read</h2> <ul> + <li><a href="{@docRoot}sdk/installing/index.html">Installing the +SDK</a></li> <li><a href="{@docRoot}tools/projects/index.html">Managing Projects</a></li> </ul> @@ -32,7 +34,8 @@ next.link=running-app.html </div> <p>An Android project contains all the files that comprise the source code for your Android -app.</p> +app. The Android SDK tools make it easy to start a new Android project with a set of +default project directories and files.</p> <p>This lesson shows how to create a new project either using Android Studio or using the diff --git a/docs/html/training/basics/firstapp/index.jd b/docs/html/training/basics/firstapp/index.jd index 4e3689a..1b6e00f 100644 --- a/docs/html/training/basics/firstapp/index.jd +++ b/docs/html/training/basics/firstapp/index.jd @@ -12,7 +12,7 @@ helpoutsWidget=true <div id="tb-wrapper"> <div id="tb"> -<h2>Dependencies</h2> +<h2>Dependencies and prerequisites</h2> <ul> <li><a href="{@docRoot}sdk/index.html">Android Studio</a></li> @@ -37,11 +37,14 @@ to:</p> <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</li> </ol> -<p class="note"><strong>Note:</strong> Although most of this training class -expects that you're using Android Studio, some procedures include alternative -instructions for using -the SDK tools from the command line instead.</p> +<p class="note"><strong>Note:</strong> Make sure you install the most recent versions of Android +Studio and the Android SDK before you start this class. The procedures described in this class may +not apply to earlier versions.</p> -<p>This class uses a tutorial format to create a small Android app that teaches +<p>If you haven't already done these tasks, start by downloading the + <a href="{@docRoot}sdk/index.html">Android SDK</a> and following the install steps. + Once you've finished the setup, you're ready to begin this class.</p> + +<p>This class uses a tutorial format that incrementally builds a small Android app that teaches you some fundamental concepts about Android development, so it's important that you follow each step.</p> diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd index 6e4605f..fdf0d1f 100644 --- a/docs/html/training/basics/firstapp/running-app.jd +++ b/docs/html/training/basics/firstapp/running-app.jd @@ -25,7 +25,7 @@ helpoutsWidget=true <ul> <li><a href="{@docRoot}tools/device.html">Using Hardware Devices</a></li> - <li><a href="{@docRoot}tools/devices/managing-avds.html">Managing AVDs with AVD Manager</a></li> + <li><a href="{@docRoot}tools/devices/index.html">Managing Virtual Devices</a></li> <li><a href="{@docRoot}tools/projects/index.html">Managing Projects</a></li> </ul> @@ -128,6 +128,10 @@ to first create an <a href="{@docRoot}tools/devices/index.html">Android Virtual AVD is a device configuration for the Android emulator that allows you to model a specific device.</p> +<div class="figure" style="width:457px"> + <img src="{@docRoot}images/screens_support/as-mac-avds-config.png" /> + <p class="img-caption"><strong>Figure 1.</strong> The AVD Manager showing a virtual device.</p> +</div> <h3>Create an AVD</h3> <ol> @@ -157,11 +161,19 @@ device.</p> </li> <li>Verify the configuration settings, then click <strong>Finish</strong>. </li> + <li>In the <strong>Android Virtual Device Manager</strong> window, click <strong>Create</strong>.</li> + <li>Enter an <strong>AVD Name</strong>.</li> + <li>Select a <strong>Device</strong> type. + <p>When you select a device type, most of the fields auto-populate.</p> + <li>For <strong>Skin</strong> select <strong>HVGA</strong>.</li> + <li>For <strong>SD Card</strong>, enter something small, like 10 MiB. + <p>It really doesn't matter what you enter here since you're not using any storage. But if you + reuse this AVD, you might have to adjust this setting.</p></li> + <li>Ignore the <strong>Emulation Options</strong> and click <strong>OK</strong>.</li> + <li>In the <strong>Result</strong> screen, click <strong>OK</strong>.</li> + <li>Close the <strong>Android Virtual Device Manager</strong> window.</li> </ol> -<p>For more information about using AVDs, see -<a href="{@docRoot}tools/devices/managing-avds.html">Managing AVDs with AVD Manager</a>.</p> - <h3>Run the app from Android Studio</h3> <ol> <li>In <strong>Android Studio</strong>, select your project and click <strong>Run</strong> diff --git a/docs/html/training/basics/network-ops/connecting.jd b/docs/html/training/basics/network-ops/connecting.jd index 1452ded..0601480 100644 --- a/docs/html/training/basics/network-ops/connecting.jd +++ b/docs/html/training/basics/network-ops/connecting.jd @@ -50,8 +50,8 @@ application manifest must include the following permissions:</p> <h2 id="http-client">Choose an HTTP Client</h2> <p>Most network-connected Android apps use HTTP to send and receive data. -Android includes two HTTP clients: {@link java.net.HttpURLConnection} and Apache - {@link org.apache.http.client.HttpClient}. Both support HTTPS, streaming uploads and downloads, configurable +Android includes two HTTP clients: {@link java.net.HttpURLConnection} and the Apache HTTP client. +Both support HTTPS, streaming uploads and downloads, configurable timeouts, IPv6, and connection pooling. We recommend using {@link java.net.HttpURLConnection} for applications targeted at Gingerbread and higher. For more discussion of this topic, see the blog post <a diff --git a/docs/html/training/volley/requestqueue.jd b/docs/html/training/volley/requestqueue.jd index 6858d91..5e892bf 100644 --- a/docs/html/training/volley/requestqueue.jd +++ b/docs/html/training/volley/requestqueue.jd @@ -39,14 +39,14 @@ as a singleton, which makes the {@code RequestQueue} last the lifetime of your a of the requests, and a cache to handle caching. There are standard implementations of these available in the Volley toolbox: {@code DiskBasedCache} provides a one-file-per-response cache with an in-memory index, and {@code BasicNetwork} provides a network transport based -on your choice of {@link android.net.http.AndroidHttpClient} or {@link java.net.HttpURLConnection}.</p> +on your choice of the Apache HTTP client {@code android.net.http.AndroidHttpClient} or +{@link java.net.HttpURLConnection}.</p> <p>{@code BasicNetwork} is Volley's default network implementation. A {@code BasicNetwork} must be initialized with the HTTP client your app is using to connect to the network. -Typically this is {@link android.net.http.AndroidHttpClient} or -{@link java.net.HttpURLConnection}:</p> +Typically this is a {@link java.net.HttpURLConnection}:</p> <ul> -<li>Use {@link android.net.http.AndroidHttpClient} for apps targeting Android API levels +<li>Use {@code android.net.http.AndroidHttpClient} for apps targeting Android API levels lower than API Level 9 (Gingerbread). Prior to Gingerbread, {@link java.net.HttpURLConnection} was unreliable. For more discussion of this topic, see <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html"> |
