am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30

automerge: 39d6b21

* commit '39d6b21ee5021d3efd1bb4e8f2041d9d8251c298':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes

18 files changed, 32 insertions, 51 deletions

diff --git a/docs/html/training/basics/activity-lifecycle/index.jd b/docs/html/training/basics/activity-lifecycle/index.jd
index 127c1c2..afeab86 100644
--- a/docs/html/training/basics/activity-lifecycle/index.jd
+++ b/docs/html/training/basics/activity-lifecycle/index.jd
@@ -1,9 +1,9 @@
 page.title=Managing the Activity Lifecycle
+page.tags=activity lifecycle
+helpoutsWidget=true
 
 trainingnavtop=true
 startpage=true
-next.title=Launching an Activity
-next.link=starting.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/activity-lifecycle/pausing.jd b/docs/html/training/basics/activity-lifecycle/pausing.jd
index f656fce..de2c92a 100644
--- a/docs/html/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html/training/basics/activity-lifecycle/pausing.jd
@@ -1,12 +1,8 @@
 page.title=Pausing and Resuming an Activity
-parent.title=Managing the Activity Lifecycle
-parent.link=index.html
+page.tags=activity lifecycle
+helpoutsWidget=true
 
 trainingnavtop=true
-previous.title=Starting an Activity
-previous.link=starting.html
-next.title=Stopping and Restarting an Activity
-next.link=stopping.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/activity-lifecycle/recreating.jd b/docs/html/training/basics/activity-lifecycle/recreating.jd
index 71fd5dd..a52d5fd 100644
--- a/docs/html/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html/training/basics/activity-lifecycle/recreating.jd
@@ -1,10 +1,8 @@
 page.title=Recreating an Activity
-parent.title=Managing the Activity Lifecycle
-parent.link=index.html
+page.tags=activity lifecycle
+helpoutsWidget=true
 
 trainingnavtop=true
-previous.title=Stopping and Restarting an Activity
-previous.link=stopping.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd
index 9046599..2501f38 100644
--- a/docs/html/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html/training/basics/activity-lifecycle/starting.jd
@@ -1,10 +1,8 @@
 page.title=Starting an Activity
-parent.title=Managing the Activity Lifecycle
-parent.link=index.html
+page.tags=activity lifecycle
+helpoutsWidget=true
 
 trainingnavtop=true
-next.title=Pausing and Resuming an Activity
-next.link=pausing.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/activity-lifecycle/stopping.jd b/docs/html/training/basics/activity-lifecycle/stopping.jd
index d56c921..51c95ea 100644
--- a/docs/html/training/basics/activity-lifecycle/stopping.jd
+++ b/docs/html/training/basics/activity-lifecycle/stopping.jd
@@ -1,12 +1,8 @@
 page.title=Stopping and Restarting an Activity
-parent.title=Managing the Activity Lifecycle
-parent.link=index.html
+page.tags=activity lifecycle
+helpoutsWidget=true
 
 trainingnavtop=true
-previous.title=Pausing and Resuming an Activity
-previous.link=pausing.html
-next.title=Recreating an Activity
-next.link=recreating.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/fragments/communicating.jd b/docs/html/training/basics/fragments/communicating.jd
index b30045d..8c1ae21 100644
--- a/docs/html/training/basics/fragments/communicating.jd
+++ b/docs/html/training/basics/fragments/communicating.jd
@@ -1,4 +1,6 @@
 page.title=Communicating with Other Fragments
+page.tags=fragments
+helpoutsWidget=true
 
 trainingnavtop=true
 
diff --git a/docs/html/training/basics/fragments/creating.jd b/docs/html/training/basics/fragments/creating.jd
index 377adfc..7afb149 100644
--- a/docs/html/training/basics/fragments/creating.jd
+++ b/docs/html/training/basics/fragments/creating.jd
@@ -1,4 +1,6 @@
 page.title=Creating a Fragment
+page.tags=fragments
+helpoutsWidget=true
 
 trainingnavtop=true
 
diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd
index 4fa5b70..1061c15 100644
--- a/docs/html/training/basics/fragments/fragment-ui.jd
+++ b/docs/html/training/basics/fragments/fragment-ui.jd
@@ -1,4 +1,6 @@
 page.title=Building a Flexible UI
+page.tags=fragments
+helpoutsWidget=true
 
 trainingnavtop=true
 
diff --git a/docs/html/training/basics/fragments/index.jd b/docs/html/training/basics/fragments/index.jd
index e78b694..aba6459 100644
--- a/docs/html/training/basics/fragments/index.jd
+++ b/docs/html/training/basics/fragments/index.jd
@@ -1,5 +1,6 @@
 page.title=Building a Dynamic UI with Fragments
 page.tags=fragments,user interface,support library
+helpoutsWidget=true
 
 trainingnavtop=true
 startpage=true
diff --git a/docs/html/training/basics/fragments/support-lib.jd b/docs/html/training/basics/fragments/support-lib.jd
index 1d538af..a1d781b 100644
--- a/docs/html/training/basics/fragments/support-lib.jd
+++ b/docs/html/training/basics/fragments/support-lib.jd
@@ -1,5 +1,6 @@
 page.title=Using the Support Library
 page.tags=support library
+helpoutsWidget=true
 
 trainingnavtop=true
 
diff --git a/docs/html/training/basics/intents/filters.jd b/docs/html/training/basics/intents/filters.jd
index 10bf43d..221e31b 100644
--- a/docs/html/training/basics/intents/filters.jd
+++ b/docs/html/training/basics/intents/filters.jd
@@ -1,10 +1,8 @@
 page.title=Allowing Other Apps to Start Your Activity
-parent.title=Interacting with Other Apps
-parent.link=index.html
+page.tags=intents
+helpoutsWidget=true
 
 trainingnavtop=true
-previous.title=Getting a Result from an Activity
-previous.link=result.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/intents/index.jd b/docs/html/training/basics/intents/index.jd
index aa0232a..d584161 100644
--- a/docs/html/training/basics/intents/index.jd
+++ b/docs/html/training/basics/intents/index.jd
@@ -1,5 +1,6 @@
 page.title=Interacting with Other Apps
 page.tags=intents,activity
+helpoutsWidget=true
 
 trainingnavtop=true
 startpage=true
diff --git a/docs/html/training/basics/intents/result.jd b/docs/html/training/basics/intents/result.jd
index 64fbb8b..b521488 100644
--- a/docs/html/training/basics/intents/result.jd
+++ b/docs/html/training/basics/intents/result.jd
@@ -1,12 +1,8 @@
 page.title=Getting a Result from an Activity
-parent.title=Interacting with Other Apps
-parent.link=index.html
+page.tags=intents
+helpoutsWidget=true
 
 trainingnavtop=true
-previous.title=Sending the User to Another App
-previous.link=sending.html
-next.title=Allowing Other Apps to Start Your Activity
-next.link=filters.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/intents/sending.jd b/docs/html/training/basics/intents/sending.jd
index 2a4dae7..4698ba1 100644
--- a/docs/html/training/basics/intents/sending.jd
+++ b/docs/html/training/basics/intents/sending.jd
@@ -1,10 +1,8 @@
 page.title=Sending the User to Another App
-parent.title=Interacting with Other Apps
-parent.link=index.html
+page.tags=intents
+helpoutsWidget=true
 
 trainingnavtop=true
-next.title=Getting a Result from an Activity
-next.link=result.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/supporting-devices/index.jd b/docs/html/training/basics/supporting-devices/index.jd
index 6f339f4..4644c31 100644
--- a/docs/html/training/basics/supporting-devices/index.jd
+++ b/docs/html/training/basics/supporting-devices/index.jd
@@ -1,5 +1,5 @@
 page.title=Supporting Different Devices
-page.tags=resources,screens,versions,localization
+page.tags=layouts,resources,screens,localization
 
 trainingnavtop=true
 startpage=true
diff --git a/docs/html/training/basics/supporting-devices/languages.jd b/docs/html/training/basics/supporting-devices/languages.jd
index aab1e38..098b556 100644
--- a/docs/html/training/basics/supporting-devices/languages.jd
+++ b/docs/html/training/basics/supporting-devices/languages.jd
@@ -1,11 +1,9 @@
 page.title=Supporting Different Languages
 parent.title=Supporting Different Devices
-page.tags=localizing,localization,resources,formats,l10n
-parent.link=index.html
+page.tags=strings,localizing,localization,resources,formats,l10n
+helpoutsWidget=true
 
 trainingnavtop=true
-next.title=Supporting Different Screens
-next.link=screens.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/supporting-devices/platforms.jd b/docs/html/training/basics/supporting-devices/platforms.jd
index 60aaf6a..9890c98 100644
--- a/docs/html/training/basics/supporting-devices/platforms.jd
+++ b/docs/html/training/basics/supporting-devices/platforms.jd
@@ -1,11 +1,9 @@
 page.title=Supporting Different Platform Versions
 page.metaDescription=Training on how to declare support for minimum and target API levels.
-parent.title=Supporting Different Devices
-parent.link=index.html
+page.tags=styles
+helpoutsWidget=true
 
 trainingnavtop=true
-previous.title=Supporting Different Screens
-previous.link=screens.html
 
 @jd:body
 
diff --git a/docs/html/training/basics/supporting-devices/screens.jd b/docs/html/training/basics/supporting-devices/screens.jd
index e52ee70..4b54de8 100644
--- a/docs/html/training/basics/supporting-devices/screens.jd
+++ b/docs/html/training/basics/supporting-devices/screens.jd
@@ -1,12 +1,8 @@
 page.title=Supporting Different Screens
-parent.title=Supporting Different Devices
-parent.link=index.html
+page.tags=layouts
+helpoutsWidget=true
 
 trainingnavtop=true
-previous.title=Supporting Different Languages
-previous.link=languages.html
-next.title=Supporting Different Platform Versions
-next.link=platforms.html
 
 @jd:body