summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-11-18 23:21:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-18 23:21:29 +0000
commite9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c (patch)
tree674505a7a4dd96bec8a6c18063b137c15ea51ad3 /docs/html
parentf256d7ac189e58a6c21a5a71e5a1dddeab2d576f (diff)
parent0d18b091eb5bb5be6f7142821b674e1648158a11 (diff)
downloadframeworks_base-e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c.zip
frameworks_base-e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c.tar.gz
frameworks_base-e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c.tar.bz2
am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
* commit '0d18b091eb5bb5be6f7142821b674e1648158a11': docs: Add link to "Voice search in your app" video.
Diffstat (limited to 'docs/html')
-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 d4b033a..adba1cd 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>