summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-08-20 16:59:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 16:59:08 +0000
commit504623e1a7b20ff7ce66ec487fb329f4b3d2c3cf (patch)
tree8308173e385de545d08118ecb3bc3fbf8f44d662
parent9f4ddca909e1f7d4274da3282a05494d6fb2f3f9 (diff)
parent5389f46ce4245a6a0cfc931160ea13dab17f6590 (diff)
downloadframeworks_base-504623e1a7b20ff7ce66ec487fb329f4b3d2c3cf.zip
frameworks_base-504623e1a7b20ff7ce66ec487fb329f4b3d2c3cf.tar.gz
frameworks_base-504623e1a7b20ff7ce66ec487fb329f4b3d2c3cf.tar.bz2
am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)
* commit '5389f46ce4245a6a0cfc931160ea13dab17f6590': Docs: Fixes to interactive-watch-face docs (CL 743190)
-rw-r--r--docs/html/training/wearables/watch-faces/index.jd2
-rw-r--r--docs/html/training/wearables/watch-faces/interacting.jd4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/training/wearables/watch-faces/index.jd b/docs/html/training/wearables/watch-faces/index.jd
index b544636..a329fda 100644
--- a/docs/html/training/wearables/watch-faces/index.jd
+++ b/docs/html/training/wearables/watch-faces/index.jd
@@ -66,7 +66,7 @@ Drawing Watch Faces</a></dt>
Showing Information in Watch Faces</a></dt>
<dd>Learn how to incorporate contextual information into your watch face.</dd>
<dt><a href="{@docRoot}training/wearables/watch-faces/interacting.html">
-Making Your Watch Face Interactive </a></dt>
+Creating Interactive Watch Faces</a></dt>
<dd>Learn how to enable the user to interact with your watch face.</dd>
<dt><a href="{@docRoot}training/wearables/watch-faces/configuration.html">
Providing Configuration Activities</a></dt>
diff --git a/docs/html/training/wearables/watch-faces/interacting.jd b/docs/html/training/wearables/watch-faces/interacting.jd
index 4f2486c..5a44fde 100644
--- a/docs/html/training/wearables/watch-faces/interacting.jd
+++ b/docs/html/training/wearables/watch-faces/interacting.jd
@@ -62,10 +62,10 @@ implementation.</p>
reserves gestures such as drag and long-press for system UI elements.
Therefore, the system does not send raw touch events to the watch face. Instead, the system forwards specific commands to the
<a href="{@docRoot}reference/android/support/wearable/watchface/WatchFaceService.Engine.html#onTapCommand(int, int, int, long)">
-method.
+onTapCommand()</a> method.
<p>The system sends the first command,
-<a href="{@docRoot}reference/android/support/wearable/watchface/WatchFaceService.html#TAP_TYPE_TOUCH"</a>
+<a href="{@docRoot}reference/android/support/wearable/watchface/WatchFaceService.html#TAP_TYPE_TOUCH">
{@code TAP_TYPE_TOUCH}</a>, when the user initially touches the
screen. This event lets you provide visual feedback to the user on touch. Your app should not
launch a UI when this event triggers. Launching a UI prevents drag events from opening the app