summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ricardo Cervera <rcervera@google.com> 2014-11-18 23:31:27 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-18 23:31:27 +0000
commit92ad1d8107e66274f226e9e3159283bb8fe3765a (patch)
tree7587edd970872e42ae6cfd3131b338c02477100b
parent2a20f425580b48ec5c130e77eb2a447731e37381 (diff)
parentb2a2d2c2fe4a8c4794d3025bc10c00404bf79cd8 (diff)
am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
* commit 'b2a2d2c2fe4a8c4794d3025bc10c00404bf79cd8': docs: Add link to "Voice search in your app" video.
-rw-r--r--docs/html/guide/components/intents-common.jd8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/html/guide/components/intents-common.jd b/docs/html/guide/components/intents-common.jd
index d4b033a5f8d7..adba1cdf4418 100644
--- a/docs/html/guide/components/intents-common.jd
+++ b/docs/html/guide/components/intents-common.jd
@@ -2282,6 +2282,14 @@ public void dialPhoneNumber(String phoneNumber) {
<li>"search for cat videos on myvideoapp"</li>
</ul>
</div>
+<!-- Video box -->
+<a class="notice-developers-video"
+ href="https://www.youtube.com/watch?v=PS1FbB5qWEI">
+<div>
+ <h3>Video</h3>
+ <p>Voice search in your app</p>
+</div>
+</a>
<p>To support search within the context of your app, declare an intent filter in your app with
the <code>SEARCH_ACTION</code> action, as shown in the example intent filter below.</p>