summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-03-11 13:52:35 -0700
committerScott Main <smain@google.com>2013-03-11 15:01:13 -0700
commit7d711b1995abb44163da35ef759eae86a6ea585b (patch)
tree4dfd3b360c67f6f27e03fa92938fc2354fcd607a
parentd55091f6fdec4bb42e2f922369dfa19f8993be8d (diff)
downloadframeworks_base-7d711b1995abb44163da35ef759eae86a6ea585b.zip
frameworks_base-7d711b1995abb44163da35ef759eae86a6ea585b.tar.gz
frameworks_base-7d711b1995abb44163da35ef759eae86a6ea585b.tar.bz2
add tags to some docs.
Training classes from top to bottom of "Connectivity and the Cloud" Change-Id: I42afb34b2a3c64d0d7a325027a19e0ab7a1847a4
-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
-rw-r--r--docs/html/training/animation/index.jd1
-rw-r--r--docs/html/training/basics/data-storage/databases.jd2
-rw-r--r--docs/html/training/basics/data-storage/files.jd2
-rw-r--r--docs/html/training/basics/data-storage/index.jd1
-rw-r--r--docs/html/training/basics/data-storage/shared-preferences.jd2
-rw-r--r--docs/html/training/basics/fragments/communicating.jd4
-rw-r--r--docs/html/training/basics/fragments/creating.jd6
-rw-r--r--docs/html/training/basics/fragments/fragment-ui.jd6
-rw-r--r--docs/html/training/basics/fragments/index.jd3
-rw-r--r--docs/html/training/basics/fragments/support-lib.jd5
-rw-r--r--docs/html/training/basics/intents/index.jd3
-rw-r--r--docs/html/training/basics/network-ops/index.jd1
-rw-r--r--docs/html/training/basics/supporting-devices/index.jd3
-rw-r--r--docs/html/training/camera/index.jd1
-rw-r--r--docs/html/training/cloudsync/index.jd3
-rw-r--r--docs/html/training/connect-devices-wirelessly/index.jd3
-rw-r--r--docs/html/training/displaying-bitmaps/index.jd3
-rw-r--r--docs/html/training/efficient-downloads/index.jd3
-rw-r--r--docs/html/training/graphics/opengl/index.jd3
-rw-r--r--docs/html/training/managing-audio/index.jd3
-rw-r--r--docs/html/training/sharing/index.jd3
24 files changed, 20 insertions, 46 deletions
diff --git a/docs/html/guide/components/activities.jd b/docs/html/guide/components/activities.jd
index 2897804..1cbaa79 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 8fd91de..766d2d7 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 3115c8f..678a512 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
diff --git a/docs/html/training/animation/index.jd b/docs/html/training/animation/index.jd
index 9cc7e6c..b2815fc 100644
--- a/docs/html/training/animation/index.jd
+++ b/docs/html/training/animation/index.jd
@@ -1,4 +1,5 @@
page.title=Adding Animations
+page.tags="animation","views","layout","user interface"
trainingnavtop=true
startpage=true
diff --git a/docs/html/training/basics/data-storage/databases.jd b/docs/html/training/basics/data-storage/databases.jd
index 8b11983..9976bb1 100644
--- a/docs/html/training/basics/data-storage/databases.jd
+++ b/docs/html/training/basics/data-storage/databases.jd
@@ -1,6 +1,4 @@
page.title=Saving Data in SQL Databases
-parent.title=Data Storage
-parent.link=index.html
trainingnavtop=true
previous.title=Saving Data in Files
diff --git a/docs/html/training/basics/data-storage/files.jd b/docs/html/training/basics/data-storage/files.jd
index dd081a6..52bea4c 100644
--- a/docs/html/training/basics/data-storage/files.jd
+++ b/docs/html/training/basics/data-storage/files.jd
@@ -1,6 +1,4 @@
page.title=Saving Files
-parent.title=Data Storage
-parent.link=index.html
trainingnavtop=true
diff --git a/docs/html/training/basics/data-storage/index.jd b/docs/html/training/basics/data-storage/index.jd
index 4334936..4ccad75 100644
--- a/docs/html/training/basics/data-storage/index.jd
+++ b/docs/html/training/basics/data-storage/index.jd
@@ -1,4 +1,5 @@
page.title=Saving Data
+page.tags="data storage","files","sql","database","preferences"
trainingnavtop=true
startpage=true
diff --git a/docs/html/training/basics/data-storage/shared-preferences.jd b/docs/html/training/basics/data-storage/shared-preferences.jd
index 099da67..a6717c4 100644
--- a/docs/html/training/basics/data-storage/shared-preferences.jd
+++ b/docs/html/training/basics/data-storage/shared-preferences.jd
@@ -1,6 +1,4 @@
page.title=Saving Key-Value Sets
-parent.title=Data Storage
-parent.link=index.html
trainingnavtop=true
diff --git a/docs/html/training/basics/fragments/communicating.jd b/docs/html/training/basics/fragments/communicating.jd
index eb9b368..b30045d 100644
--- a/docs/html/training/basics/fragments/communicating.jd
+++ b/docs/html/training/basics/fragments/communicating.jd
@@ -1,10 +1,6 @@
page.title=Communicating with Other Fragments
-parent.title=Building a Dynamic UI with Fragments
-parent.link=index.html
trainingnavtop=true
-previous.title=Building a Flexible UI
-previous.link=fragment-ui.html
@jd:body
diff --git a/docs/html/training/basics/fragments/creating.jd b/docs/html/training/basics/fragments/creating.jd
index 0646230..b5df4e1 100644
--- a/docs/html/training/basics/fragments/creating.jd
+++ b/docs/html/training/basics/fragments/creating.jd
@@ -1,12 +1,6 @@
page.title=Creating a Fragment
-parent.title=Building a Dynamic UI with Fragments
-parent.link=index.html
trainingnavtop=true
-previous.title=Using the Android Support Library
-previous.link=support-lib.html
-next.title=Building a Flexible UI
-next.link=fragment-ui.html
@jd:body
diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd
index 4ec4de5..d648938 100644
--- a/docs/html/training/basics/fragments/fragment-ui.jd
+++ b/docs/html/training/basics/fragments/fragment-ui.jd
@@ -1,12 +1,6 @@
page.title=Building a Flexible UI
-parent.title=Building a Dynamic UI with Fragments
-parent.link=index.html
trainingnavtop=true
-previous.title=Create a Fragment
-previous.link=creating.html
-next.title=Communicating with Other Fragments
-next.link=communicating.html
@jd:body
diff --git a/docs/html/training/basics/fragments/index.jd b/docs/html/training/basics/fragments/index.jd
index bc93f43..1b82f2c 100644
--- a/docs/html/training/basics/fragments/index.jd
+++ b/docs/html/training/basics/fragments/index.jd
@@ -1,9 +1,8 @@
page.title=Building a Dynamic UI with Fragments
+page.tags="fragments", "user interface", "support library"
trainingnavtop=true
startpage=true
-next.title=Using the Android Support Library
-next.link=support-lib.html
@jd:body
diff --git a/docs/html/training/basics/fragments/support-lib.jd b/docs/html/training/basics/fragments/support-lib.jd
index cc867d3..b097de1 100644
--- a/docs/html/training/basics/fragments/support-lib.jd
+++ b/docs/html/training/basics/fragments/support-lib.jd
@@ -1,10 +1,7 @@
page.title=Using the Support Library
-parent.title=Building a Dynamic UI with Fragments
-parent.link=index.html
+page.tags="support library"
trainingnavtop=true
-next.title=Creating a Fragment
-next.link=creating.html
@jd:body
diff --git a/docs/html/training/basics/intents/index.jd b/docs/html/training/basics/intents/index.jd
index d94ff01..8876a33 100644
--- a/docs/html/training/basics/intents/index.jd
+++ b/docs/html/training/basics/intents/index.jd
@@ -1,9 +1,8 @@
page.title=Interacting with Other Apps
+page.tags="intents","activity"
trainingnavtop=true
startpage=true
-next.title=Sending the User to Another App
-next.link=sending.html
@jd:body
diff --git a/docs/html/training/basics/network-ops/index.jd b/docs/html/training/basics/network-ops/index.jd
index b213c03..cb3a390 100644
--- a/docs/html/training/basics/network-ops/index.jd
+++ b/docs/html/training/basics/network-ops/index.jd
@@ -1,4 +1,5 @@
page.title=Performing Network Operations
+page.tags="network","wireless"
trainingnavtop=true
startpage=true
diff --git a/docs/html/training/basics/supporting-devices/index.jd b/docs/html/training/basics/supporting-devices/index.jd
index 49ea81d..1e3eb42 100644
--- a/docs/html/training/basics/supporting-devices/index.jd
+++ b/docs/html/training/basics/supporting-devices/index.jd
@@ -1,9 +1,8 @@
page.title=Supporting Different Devices
+page.tags="resources","screens","versions","localization"
trainingnavtop=true
startpage=true
-next.title=Supporting Multiple Languages
-next.link=languages.html
@jd:body
diff --git a/docs/html/training/camera/index.jd b/docs/html/training/camera/index.jd
index 282bed8..fa754a0 100644
--- a/docs/html/training/camera/index.jd
+++ b/docs/html/training/camera/index.jd
@@ -1,4 +1,5 @@
page.title=Capturing Photos
+page.tags="camera","video"
trainingnavtop=true
startpage=true
diff --git a/docs/html/training/cloudsync/index.jd b/docs/html/training/cloudsync/index.jd
index 91885e8..55b275b 100644
--- a/docs/html/training/cloudsync/index.jd
+++ b/docs/html/training/cloudsync/index.jd
@@ -1,9 +1,8 @@
page.title=Syncing to the Cloud
+page.tags="cloud","sync","backup"
trainingnavtop=true
startpage=true
-next.title=Making the Most of Google Cloud Messaging
-next.link=gcm.html
@jd:body
diff --git a/docs/html/training/connect-devices-wirelessly/index.jd b/docs/html/training/connect-devices-wirelessly/index.jd
index 37cf633..f27b9c3 100644
--- a/docs/html/training/connect-devices-wirelessly/index.jd
+++ b/docs/html/training/connect-devices-wirelessly/index.jd
@@ -1,9 +1,8 @@
page.title=Connecting Devices Wirelessly
+page.tags="wifi","network","wireless"
trainingnavtop=true
startpage=true
-next.title=Using Network Service Discovery
-next.link=nsd.html
@jd:body
diff --git a/docs/html/training/displaying-bitmaps/index.jd b/docs/html/training/displaying-bitmaps/index.jd
index b91172b..378d977 100644
--- a/docs/html/training/displaying-bitmaps/index.jd
+++ b/docs/html/training/displaying-bitmaps/index.jd
@@ -1,9 +1,8 @@
page.title=Displaying Bitmaps Efficiently
+page.tags="bitmaps","images","graphics"
trainingnavtop=true
startpage=true
-next.title=Loading Large Bitmaps Efficiently
-next.link=load-bitmap.html
@jd:body
diff --git a/docs/html/training/efficient-downloads/index.jd b/docs/html/training/efficient-downloads/index.jd
index a29be91..2ab93ae 100644
--- a/docs/html/training/efficient-downloads/index.jd
+++ b/docs/html/training/efficient-downloads/index.jd
@@ -1,9 +1,8 @@
page.title=Transferring Data Without Draining the Battery
+page.tags="battery","network","wireless"
trainingnavtop=true
startpage=true
-next.title=Optimizing Downloads for Efficient Network Access
-next.link=efficient-network-access.html
@jd:body
diff --git a/docs/html/training/graphics/opengl/index.jd b/docs/html/training/graphics/opengl/index.jd
index 23a734a..cf33d80 100644
--- a/docs/html/training/graphics/opengl/index.jd
+++ b/docs/html/training/graphics/opengl/index.jd
@@ -1,7 +1,6 @@
page.title=Displaying Graphics with OpenGL ES
+page=tags="open gl","graphics"
trainingnavtop=true
-next.title=Building an OpenGL ES Environment
-next.link=environment.html
@jd:body
diff --git a/docs/html/training/managing-audio/index.jd b/docs/html/training/managing-audio/index.jd
index 0f7bbfd..3e3bcf0 100644
--- a/docs/html/training/managing-audio/index.jd
+++ b/docs/html/training/managing-audio/index.jd
@@ -1,9 +1,8 @@
page.title=Managing Audio Playback
+page.tags="audio","media"
trainingnavtop=true
startpage=true
-next.title=Controlling Your App's Volume and Playback
-next.link=volume-playback.html
@jd:body
diff --git a/docs/html/training/sharing/index.jd b/docs/html/training/sharing/index.jd
index c2e8dbc..2aa22b6 100644
--- a/docs/html/training/sharing/index.jd
+++ b/docs/html/training/sharing/index.jd
@@ -1,9 +1,8 @@
page.title=Sharing Content
+page.tags="intents","share"
trainingnavtop=true
startpage=true
-next.title=Sending Content to Other Apps
-next.link=send.html
@jd:body