summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bert McMeen <amcmeen@google.com> 2016-06-29 21:54:42 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-29 21:54:42 +0000
commit7a6494aeaf7d7c835447fa7d03a675ca5ee6e4c5 (patch)
treeb53eaedf6dc29d9ed6f4a3f31f00a3b1ca54af17
parentac5b340487d2342b6f0d4a0a946fb58b530d4040 (diff)
parentcdfe5e4f554fe7269c1234a838dbc9ea8ce63ab1 (diff)
Docs: Links added to pages for permissions and configuration activity
am: cdfe5e4f55 Change-Id: I3e9cde3cb24c5c779059c4708b144a2376c9616c
-rw-r--r--docs/html/wear/preview/features/complications.jd11
1 files changed, 8 insertions, 3 deletions
diff --git a/docs/html/wear/preview/features/complications.jd b/docs/html/wear/preview/features/complications.jd
index d33fd2a789e5..3334cb79b143 100644
--- a/docs/html/wear/preview/features/complications.jd
+++ b/docs/html/wear/preview/features/complications.jd
@@ -113,8 +113,8 @@ page.image=/wear/preview/images/complications-main-image.png
<p>
To start receiving complication data, a watch face calls
- <code>setActiveComplications</code> within the
- <code>WatchFaceService.Engine</code> class with a list of watch face
+ <code>setActiveComplications</code>, in the
+ <code>WatchFaceService.Engine</code> class, with a list of watch face
complication IDs. A watch face creates these IDs to uniquely identify
slots on the watch face where complications can appear, and passes them
to the <code>createProviderChooserIntent</code> method (of the
@@ -283,7 +283,12 @@ android.support.wearable.complications.UPDATE_PERIOD_SECONDS
</p>
<p>
- The configuration activity may also be used as an opportunity to request
+ If a data provider needs a specific permission to access a user's data,
+ then standard code
+ for runtime <a href="{@docRoot}training/articles/wear-permissions.html">
+ permissions</a> is needed.
+ A <a href="{@docRoot}training/wearables/watch-faces/configuration.html">
+ configuration activity</a> may be used as an opportunity to request
any permissions required by the provider.
</p>