diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-11-01 17:40:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-01 17:40:53 +0000 |
| commit | 158183c79a5389c83d6f54896c31ecd46317eb0d (patch) | |
| tree | 6fdb6904dbf1d7fbae00bed31d881bb4281a599a /docs/html/training | |
| parent | 31a378efbf4603fe0bc82855cbd868d27628b1f2 (diff) | |
| parent | fd8184e4247f81f6027ae3cc328e8a19869c2d5e (diff) | |
| download | frameworks_base-158183c79a5389c83d6f54896c31ecd46317eb0d.zip frameworks_base-158183c79a5389c83d6f54896c31ecd46317eb0d.tar.gz frameworks_base-158183c79a5389c83d6f54896c31ecd46317eb0d.tar.bz2 | |
am fd8184e4: am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0 automerge: 721b1d3
* commit 'fd8184e4247f81f6027ae3cc328e8a19869c2d5e':
docs: Add links to Wear UI training from Design pages.
Diffstat (limited to 'docs/html/training')
| -rw-r--r-- | docs/html/training/wearables/apps/layouts.jd | 12 | ||||
| -rw-r--r-- | docs/html/training/wearables/data-layer/index.jd | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/html/training/wearables/apps/layouts.jd b/docs/html/training/wearables/apps/layouts.jd index e62d3e5..a35acb0 100644 --- a/docs/html/training/wearables/apps/layouts.jd +++ b/docs/html/training/wearables/apps/layouts.jd @@ -90,9 +90,10 @@ PendingIntent notificationPendingIntent = PendingIntent.getActivity(this, 0, not </ol> <h2 id="UiLibrary">Create Layouts with the Wearable UI Library</h2> <p> -There's an unofficial UI library that is automatically included when you create your wearable -app with the Android Studio Project Wizard. You can also add the library to your <code>build.gradle</code> +The Wearable UI Library is automatically included when you create your wearable +app with the Android Studio Project Wizard. You can also add this library to your <code>build.gradle</code> file with the following dependency declaration: +</p> <pre> dependencies { @@ -101,8 +102,11 @@ dependencies { compile 'com.google.android.gms:play-services-wearable:+' } </pre> -This library helps you build UIs that are designed for wearables. Here are some of the major classes: -</p> + +<p>This library helps you build UIs that are designed for wearables. For more information, see +<a href="{@docRoot}training/wearables/ui/index.html">Creating Custom UIs for Wear Devices</a>.</p> + +<p>Here are some of the major classes in the Wearable UI Library:</p> <ul> <li><code>BoxInsetLayout</code> - A FrameLayout that's aware of screen shape and can box its diff --git a/docs/html/training/wearables/data-layer/index.jd b/docs/html/training/wearables/data-layer/index.jd index 39d6561..6ef3fc7 100644 --- a/docs/html/training/wearables/data-layer/index.jd +++ b/docs/html/training/wearables/data-layer/index.jd @@ -8,7 +8,7 @@ page.title=Sending and Syncing Data <h2>Dependencies and prerequisites</h2> <ul> <li>Android 4.3 (API Level 18) or higher on the handset device</li> - <li>The latest version of <a href="{@docRoot}google/play">Google Play services</a></li> + <li>The latest version of <a href="{@docRoot}google/play-services/index.html">Google Play services</a></li> <li>An Android Wear device or Wear AVD</li> </ul> </div> |