summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-11-01 17:41:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-01 17:41:03 +0000
commita564f7bf94d0efc2d13ab9c46c0159cf0b8a35f9 (patch)
tree489e671bbf26b600b7297fe920afb3b323de3b22 /docs/html
parente55c4f43df68f8baf0d92273cc2eb9c3123bcdb5 (diff)
parenta004c2ec06a5ba3d65786e50171d8cdbb80515c8 (diff)
downloadframeworks_base-a564f7bf94d0efc2d13ab9c46c0159cf0b8a35f9.zip
frameworks_base-a564f7bf94d0efc2d13ab9c46c0159cf0b8a35f9.tar.gz
frameworks_base-a564f7bf94d0efc2d13ab9c46c0159cf0b8a35f9.tar.bz2
am a004c2ec: am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page automerge: b2b3b37 automerge: 07c9807
* commit 'a004c2ec06a5ba3d65786e50171d8cdbb80515c8': revise helpouts tags to use just one on each page
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/sdk/installing/adding-packages.jd2
-rw-r--r--docs/html/sdk/installing/index.jd2
-rw-r--r--docs/html/training/basics/firstapp/building-ui.jd2
-rw-r--r--docs/html/training/basics/firstapp/creating-project.jd2
-rw-r--r--docs/html/training/basics/firstapp/starting-activity.jd2
5 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
index 22d055c..b8d8925 100644
--- a/docs/html/sdk/installing/adding-packages.jd
+++ b/docs/html/sdk/installing/adding-packages.jd
@@ -1,6 +1,6 @@
page.title=Adding SDK Packages
-page.tags=studio, sdk tools, eclipse adt, sdk manager, google play services, support library
+page.tags=sdk manager
helpoutsWidget=true
@jd:body
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 493a517..1dc268b 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -1,6 +1,6 @@
page.title=Installing the Android SDK
-page.tags=studio, sdk tools, eclipse adt
+page.tags=sdk tools
helpoutsWidget=true
@jd:body
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd
index 2668913..dcf3a16 100644
--- a/docs/html/training/basics/firstapp/building-ui.jd
+++ b/docs/html/training/basics/firstapp/building-ui.jd
@@ -1,7 +1,7 @@
page.title=Building a Simple User Interface
trainingnavtop=true
-page.tags=ui, views, layouts, widgets, string resources
+page.tags=ui
helpoutsWidget=true
@jd:body
diff --git a/docs/html/training/basics/firstapp/creating-project.jd b/docs/html/training/basics/firstapp/creating-project.jd
index f33f75f..71b93c0 100644
--- a/docs/html/training/basics/firstapp/creating-project.jd
+++ b/docs/html/training/basics/firstapp/creating-project.jd
@@ -1,6 +1,6 @@
page.title=Creating an Android Project
-page.tags=eclipse adt, sdk tools, project setup
+page.tags=project setup
helpoutsWidget=true
trainingnavtop=true
diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd
index d672838..7aad894 100644
--- a/docs/html/training/basics/firstapp/starting-activity.jd
+++ b/docs/html/training/basics/firstapp/starting-activity.jd
@@ -4,7 +4,7 @@ parent.link=index.html
trainingnavtop=true
-page.tags=input events, intents, activity lifecycle
+page.tags=intents
helpoutsWidget=true
@jd:body