summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/training/basics')
-rw-r--r--docs/html/training/basics/firstapp/creating-project.jd5
-rw-r--r--docs/html/training/basics/firstapp/index.jd15
-rw-r--r--docs/html/training/basics/firstapp/running-app.jd20
-rw-r--r--docs/html/training/basics/network-ops/connecting.jd4
4 files changed, 31 insertions, 13 deletions
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