summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/building-wearables.jd6
-rw-r--r--docs/html/training/game-controllers/controller-input.jd5
-rw-r--r--docs/html/training/wearables/apps/layouts.jd6
-rw-r--r--docs/html/training/wearables/notifications/creating.jd4
-rw-r--r--docs/html/training/wearables/ui/layouts.jd4
-rw-r--r--docs/html/training/wearables/watch-faces/service.jd4
6 files changed, 15 insertions, 14 deletions
diff --git a/docs/html/training/building-wearables.jd b/docs/html/training/building-wearables.jd
index 0745c93..8015d0c 100644
--- a/docs/html/training/building-wearables.jd
+++ b/docs/html/training/building-wearables.jd
@@ -7,4 +7,8 @@ page.metaDescription=Learn how to build notifications, send and sync data, and u
<p>These classes teach you how to build notifications in a handheld app that are automatically
-synced to wearables as well as how to build apps that run on wearables.</p> \ No newline at end of file
+synced to wearables as well as how to build apps that run on wearables.</p>
+
+<p class="note"><strong>Note:</strong> For more information about the APIs used in these training
+classes, see the <a href="{@docRoot}reference/packages-wearable-support.html">Wear API reference
+documentation</a>.</p> \ No newline at end of file
diff --git a/docs/html/training/game-controllers/controller-input.jd b/docs/html/training/game-controllers/controller-input.jd
index 25fcde4..70e0585 100644
--- a/docs/html/training/game-controllers/controller-input.jd
+++ b/docs/html/training/game-controllers/controller-input.jd
@@ -518,7 +518,7 @@ public class GameView extends View {
// Check that the event came from a game controller
if ((event.getSource() &amp; InputDevice.SOURCE_JOYSTICK) ==
InputDevice.SOURCE_JOYSTICK &amp;&amp;
- event.getAction() == MotionEvent.ACTION_MOVE)
+ event.getAction() == MotionEvent.ACTION_MOVE) {
// Process all historical movement samples in the batch
final int historySize = event.getHistorySize();
@@ -609,9 +609,6 @@ private void processJoystickInput(MotionEvent event,
}
// Update the ship object based on the new x and y values
- ...
-
- return true;
}
</pre>
<p>To support game controllers that have more sophisticated
diff --git a/docs/html/training/wearables/apps/layouts.jd b/docs/html/training/wearables/apps/layouts.jd
index 69e57ca..1d0e49b 100644
--- a/docs/html/training/wearables/apps/layouts.jd
+++ b/docs/html/training/wearables/apps/layouts.jd
@@ -142,9 +142,9 @@ dependencies {
<h3 id="UiLibReference">Wear UI library API reference</h3>
-<p>The reference documentation explains how to use each UI widget in detail. Download the
-<a href="{@docRoot}shareables/training/wearable-support-docs.zip">API reference documentation</a>
-for the classes above.</p>
+<p>The reference documentation explains how to use each UI widget in detail. Browse the
+<a href="{@docRoot}reference/android/support/wearable/view/package-summary.html">Wear API
+reference documentation</a> for the classes above.</p>
<h3 id="UiLibEclipse">Download the Wearable UI library for Eclipse ADT</h3>
diff --git a/docs/html/training/wearables/notifications/creating.jd b/docs/html/training/wearables/notifications/creating.jd
index 542664b..6f8497a 100644
--- a/docs/html/training/wearables/notifications/creating.jd
+++ b/docs/html/training/wearables/notifications/creating.jd
@@ -270,10 +270,10 @@ methods are just two examples of new notification features available with
{@link android.support.v4.app.NotificationCompat.WearableExtender#setBackground setBackground()}
should have a resolution of 400x400 for non-scrolling backgrounds and 640x400 for backgrounds
that support parallax scrolling. Place these bitmap images in the <code>res/drawable-nodpi</code>
-directory of your handheld app. Place other non-bitmap resources for wearable notifications, such
+directory. Place other non-bitmap resources for wearable notifications, such
as those used with the
{@link android.support.v4.app.NotificationCompat.WearableExtender#setContentIcon setContentIcon()}
-method, in the <code>res/drawable-hdpi</code> directory of your handheld app.</p>
+method, in the <code>res/drawable-hdpi</code> directory.</p>
<p>If you ever need to read wearable-specific options at a later time, use the corresponding get
method for the option. This example calls the
diff --git a/docs/html/training/wearables/ui/layouts.jd b/docs/html/training/wearables/ui/layouts.jd
index 130f1c4..0eb1395 100644
--- a/docs/html/training/wearables/ui/layouts.jd
+++ b/docs/html/training/wearables/ui/layouts.jd
@@ -88,8 +88,8 @@ dependencies {
<p>The <code>'com.google.android.support:wearable'</code> dependency is required to implement
the layout techniques shown in the following sections.</p>
-<p><a href="/shareables/training/wearable-support-docs.zip">Download the full API
-reference documentation</a> for the Wearable UI Library classes.</p>
+<p>Browse the <a href="{@docRoot}reference/android/support/wearable/view/package-summary.html">
+API reference documentation</a> for the Wearable UI Library classes.</p>
<h2 id="different-layouts">Specify Different Layouts for Square and Round Screens</h2>
diff --git a/docs/html/training/wearables/watch-faces/service.jd b/docs/html/training/wearables/watch-faces/service.jd
index 77c417f..7ab575e 100644
--- a/docs/html/training/wearables/watch-faces/service.jd
+++ b/docs/html/training/wearables/watch-faces/service.jd
@@ -103,8 +103,8 @@ Data Layer API</a>.</p>
<h3 id="Reference">Wearable Support Library API Reference</h3>
<p>The reference documentation provides detailed information about the classes you use to
-implement watch faces. Download the
-<a href="{@docRoot}shareables/training/wearable-support-docs.zip">API reference
+implement watch faces. Browse the
+<a href="{@docRoot}reference/android/support/wearable/watchface/package-summary.html">API reference
documentation</a> for the Wearable Support Library.</p>
<h3 id="LibEclipse">Download the Wearable Support Library for Eclipse ADT</h3>