Merge "docs: fix links" into klp-modular-dev

docs/html/training/wearables/apps/index.jd

@@ -69,6 +69,6 @@ in ADT. The rest of this training assumes you're using Android Studio.
       <dd>Learn how to package a wearable app inside a
       handheld app. This allows the system to install the wearable app automatically when
       users install the companion handheld app from the Google Play store.</dd>
-    <dt><a href="{@docRoot}training/wearables/apps/packaging.html">Debugging over Bluetooth</a></dt>
+    <dt><a href="{@docRoot}training/wearables/apps/bt-debugging.html">Debugging over Bluetooth</a></dt>
       <dd>Learn how to debug your wearable over Bluetooth instead of USB.</dd>
   </dl>

docs/html/training/wearables/apps/layouts.jd

@@ -11,7 +11,6 @@ page.title=Creating Custom Layouts
   <li><a href="#UiLibrary">Create Layouts with the Wearable UI Library</li>
 </ol>
 
-<!--STOPSHIP: link these -->
 <h2>You should also read</h2>
 <ul>
   <li><a href="{@docRoot}design/wear/index.html">Android Wear Design Principles</a></li>

docs/html/training/wearables/apps/packaging.jd

@@ -34,7 +34,7 @@ Android Studio directly to the wearable is required.</p>
 <pre>
 dependencies {
    compile 'com.google.android.gms:play-services:5.0.+@aar'
-   compile files('../../prebuilt-libs/android-support-v4.jar')
+   compile 'com.android.support:support-v4:20.0.+''
    <b>wearApp project(':wearable')</b>
 }
 </pre>

docs/html/training/wearables/data-layer/assets.jd

@@ -91,8 +91,8 @@ public void onDataChanged(DataEventBuffer dataEvents) {
   for (DataEvent event : dataEvents) {
     if (event.getType() == DataEvent.TYPE_CHANGED &&
         event.getDataItem().getUri().getPath().equals("/image")) {
-      BundleDataItem bundleDataItem = BundleDataItem.fromDataItem(dataItem); 
-      Asset profileAsset = bundleDataItem.getData().getParcelable("profileImage");
+      DataMapItem dataMapItem = DataMapItem.fromDataItem(dataItem); 
+      Asset profileAsset = dataMapItem.getDataMap().getAsset("profileImage");
       Bitmap bitmap = loadBitmapFromAsset(profileAsset);
       // Do something with the bitmap
     }

docs/html/training/wearables/data-layer/data-items.jd

@@ -120,5 +120,5 @@ public void onDataChanged(DataEventBuffer dataEvents) {
 <p>
 This is just a snippet that requires more implementation details. Learn about
 how to implement a full listener service or activity in
-<a href="{@docRoot}training/wearables/data-layer/listeners.html">Listening for Data Layer Events</a>.
+<a href="{@docRoot}training/wearables/data-layer/events.html">Listening for Data Layer Events</a>.
 </p>