summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-08-20 18:16:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 18:16:11 +0000
commit740eef52e808f2fb82b7149b8febab60222cb0a4 (patch)
treeb9e19bab42cde011df32427a938aeecdfdd38ccd
parent51e8df2ee64ba605e6695279a8aab987b2a56903 (diff)
parent33074733f015e3e8f84cf0aaebdfbe859f0f6800 (diff)
downloadframeworks_base-740eef52e808f2fb82b7149b8febab60222cb0a4.zip
frameworks_base-740eef52e808f2fb82b7149b8febab60222cb0a4.tar.gz
frameworks_base-740eef52e808f2fb82b7149b8febab60222cb0a4.tar.bz2
am 33074733: am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)
* commit '33074733f015e3e8f84cf0aaebdfbe859f0f6800': 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