commit 709df4fa2600d1d2ee2f686097e1c92b52b58d19
author Joe Fernandez <joefernandez@google.com> Thu Dec 04 20:50:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 04 20:50:49 2014 +0000
tree 8c1b4cd8450fb81957baf5c90301fda9db31f14e
parent daab7426b254b57820f3e556960e9f5b20ba5bc6
parent 71d58705d8c769cd9000b012f93eb571472ba9d4

Merge "docs: Fixes for App Indexing training class" into lmp-docs

docs/html/training/app-indexing/deep-linking.jd

diff --git a/docs/html/training/app-indexing/deep-linking.jd b/docs/html/training/app-indexing/deep-linking.jd
index a52ae95..2679937 100644
--- a/docs/html/training/app-indexing/deep-linking.jd
+++ b/docs/html/training/app-indexing/deep-linking.jd
@@ -61,13 +61,15 @@
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <!-- Accepts URIs that begin with "example://gizmos” -->
-        <data android:scheme="example"
-              android:host="gizmos" />
         <!-- Accepts URIs that begin with "http://www.example.com/gizmos” -->
         <data android:scheme="http"
               android:host="www.example.com"
-              android:pathPrefix="gizmos" />
+              android:pathPrefix="/gizmos" />
+        <!-- note that the leading "/" is required for pathPrefix-->
+        <!-- Accepts URIs that begin with "example://gizmos”
+        <data android:scheme="example"
+              android:host="gizmos" />
+        -->
     </intent-filter>
 </activity>
 </pre>
@@ -76,6 +78,11 @@
 manifest, Android is able to route any {@link android.content.Intent}
 that has matching URIs to your app at runtime.</p>
 
+<p class="note">
+  <strong>Note:</strong> Intent filters may only contain a single {@code data} element
+  for a URI pattern. Create separate intent filters to capture additional URI patterns.
+</p>
+
 <p>To learn more about defining intent filters, see <a href="{@docRoot}training/basics/intents/filters.html">Allow Other Apps to Start Your Activity</a>.</p>
 
 <h2 id="handling-intents">Read Data from Incoming Intents</h2>

docs/html/training/app-indexing/index.jd

diff --git a/docs/html/training/app-indexing/index.jd b/docs/html/training/app-indexing/index.jd
index 7e7241b..45afea8 100644
--- a/docs/html/training/app-indexing/index.jd
+++ b/docs/html/training/app-indexing/index.jd
@@ -24,7 +24,7 @@
 </ul>
 </div>
 </div>
-<a class="notice-developers-video wide" href="http://www.youtube.com/watch?v=Xh_W82JgOms">
+<a class="notice-developers-video wide" href="http://www.youtube.com/watch?v=aISUYHTkTOU">
 <div>
     <h3>Video</h3>
     <p>DevBytes: App Indexing</p>