summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-12-01 21:22:53 -0800
committerJoe Fernandez <joefernandez@google.com>2014-12-04 12:49:45 -0800
commit71d58705d8c769cd9000b012f93eb571472ba9d4 (patch)
tree067080e91f5142166dc7e223f6d4c2d23d60c64b /docs/html/training
parent1f5acf84800f58607e5e9f36c48e3b53f10c1163 (diff)
downloadframeworks_base-71d58705d8c769cd9000b012f93eb571472ba9d4.zip
frameworks_base-71d58705d8c769cd9000b012f93eb571472ba9d4.tar.gz
frameworks_base-71d58705d8c769cd9000b012f93eb571472ba9d4.tar.bz2
docs: Fixes for App Indexing training class
b/18244320 b/17982146 Change-Id: Ic095c3c73d09fa2d7f3c08fa47763fa8589683af
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/app-indexing/deep-linking.jd15
-rw-r--r--docs/html/training/app-indexing/index.jd2
2 files changed, 12 insertions, 5 deletions
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 @@ in your manifest for deep linking. The URIs {@code “example://gizmos”} and
&lt;action android:name="android.intent.action.VIEW" /&gt;
&lt;category android:name="android.intent.category.DEFAULT" /&gt;
&lt;category android:name="android.intent.category.BROWSABLE" /&gt;
- &lt;!-- Accepts URIs that begin with "example://gizmos” --&gt;
- &lt;data android:scheme="example"
- android:host="gizmos" /&gt;
&lt;!-- Accepts URIs that begin with "http://www.example.com/gizmos” --&gt;
&lt;data android:scheme="http"
android:host="www.example.com"
- android:pathPrefix="gizmos" /&gt;
+ android:pathPrefix="/gizmos" /&gt;
+ &lt;!-- note that the leading "/" is required for pathPrefix--&gt;
+ &lt;!-- Accepts URIs that begin with "example://gizmos”
+ &lt;data android:scheme="example"
+ android:host="gizmos" /&gt;
+ --&gt;
&lt;/intent-filter&gt;
&lt;/activity&gt;
</pre>
@@ -76,6 +78,11 @@ in your manifest for deep linking. The URIs {@code “example://gizmos”} and
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>
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 @@ Filters</a></li>
</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>