summaryrefslogtreecommitdiff
path: root/docs/html/guide
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2013-03-18 21:29:17 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-03-18 21:29:18 +0000
commitf82df78b3534b0ffde83fe83bdb798d3bb7ab780 (patch)
treef62b71e113cce71cf835c163be701b02defb02e6 /docs/html/guide
parent4758e3e7c824bc5cb8b11b6536c5236145f2670f (diff)
parent7d711b1995abb44163da35ef759eae86a6ea585b (diff)
Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/components/activities.jd1
-rw-r--r--docs/html/guide/topics/manifest/data-element.jd3
-rw-r--r--docs/html/guide/topics/ui/actionbar.jd1
3 files changed, 5 insertions, 0 deletions
diff --git a/docs/html/guide/components/activities.jd b/docs/html/guide/components/activities.jd
index 289780421a61..1cbaa79194e5 100644
--- a/docs/html/guide/components/activities.jd
+++ b/docs/html/guide/components/activities.jd
@@ -1,4 +1,5 @@
page.title=Activities
+page.tags="activity","intent"
@jd:body
<div id="qv-wrapper">
diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd
index 8fd91deae6a2..766d2d7b4d6c 100644
--- a/docs/html/guide/topics/manifest/data-element.jd
+++ b/docs/html/guide/topics/manifest/data-element.jd
@@ -85,6 +85,9 @@ host names using lowercase letters.</p>
The subtype can be the asterisk wildcard ({@code *}) to indicate that any
subtype matches.
+<p>It's common for an intent filter to declare a {@code &lt;data>} that includes
+only the {@code android:mimeType} attribute.</p>
+
<p class="note">Note: MIME type matching in the Android framework is
case-sensitive, unlike formal RFC MIME types. As a result, you should always
specify MIME types using lowercase letters.</p>
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index 3115c8f1f9d8..678a512e0f88 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -1,4 +1,5 @@
page.title=Action Bar
+page.tags="action bar","menu"
parent.title=User Interface
parent.link=index.html
@jd:body