docs: add camera and design, remove users

update title names for many lessons

Change-Id: I7a3d30bcb9786a351c04f05fcee39bb42954d2e8

28 files changed, 41 insertions, 38 deletions

diff --git a/docs/html/training/camera/cameradirect.jd b/docs/html/training/camera/cameradirect.jd
index 1e25d4f..03ad119 100644
--- a/docs/html/training/camera/cameradirect.jd
+++ b/docs/html/training/camera/cameradirect.jd
@@ -1,5 +1,5 @@
 page.title=Controlling the Camera
-parent.title=Capturing Photos with the Camera
+parent.title=Capturing Photos
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/camera/index.jd b/docs/html/training/camera/index.jd
index 31adfe8..d209c7e 100644
--- a/docs/html/training/camera/index.jd
+++ b/docs/html/training/camera/index.jd
@@ -1,4 +1,4 @@
-page.title=Capturing Photos with the Camera
+page.title=Capturing Photos
 
 trainingnavtop=true
 startpage=true
@@ -28,7 +28,8 @@ next.link=photobasics.html
 <h2>Try it out</h2>
 
 <div class="download-box">
- <a href="{@docRoot}shareables/training/PhotoIntentActivity.zip" class="button">Download the sample</a>
+ <a href="http://developer.android.com/shareables/training/PhotoIntentActivity.zip"
+class="button">Download the sample</a>
  <p class="filename">PhotoIntentActivity.zip</p>
 </div>
 
diff --git a/docs/html/training/camera/photobasics.jd b/docs/html/training/camera/photobasics.jd
index 002dec7..e6ab43e 100644
--- a/docs/html/training/camera/photobasics.jd
+++ b/docs/html/training/camera/photobasics.jd
@@ -1,5 +1,5 @@
 page.title=Taking Photos Simply
-parent.title=Capturing Photos with the Camera
+parent.title=Capturing Photos
 parent.link=index.html
 
 trainingnavtop=true
@@ -31,7 +31,8 @@ next.link=videobasics.html
 
     <h2>Try it out</h2>
     <div class="download-box">
-      <a href="{@docRoot}shareables/training/PhotoIntentActivity.zip" class="button">Download the
+      <a href="http://developer.android.com/shareables/training/PhotoIntentActivity.zip"
+class="button">Download the
 sample</a>
       <p class="filename">PhotoIntentActivity.zip</p>
     </div>
diff --git a/docs/html/training/camera/videobasics.jd b/docs/html/training/camera/videobasics.jd
index a0f5732..a3512b0 100644
--- a/docs/html/training/camera/videobasics.jd
+++ b/docs/html/training/camera/videobasics.jd
@@ -1,5 +1,5 @@
 page.title=Recording Videos Simply
-parent.title=Capturing Photos with the Camera
+parent.title=Capturing Photos
 parent.link=index.html
 
 trainingnavtop=true
@@ -31,8 +31,8 @@ next.link=cameradirect.html
     <h2>Try it out</h2>
 
     <div class="download-box">
-      <a href="{@docRoot}shareables/training/PhotoIntentActivity.zip" class="button">Download the
-sample</a>
+      <a href="http://developer.android.com/shareables/training/PhotoIntentActivity.zip"
+class="button">Download the sample</a>
       <p class="filename">PhotoIntentActivity.zip</p>
     </div>
   </div>
diff --git a/docs/html/training/design-navigation/ancestral-temporal.jd b/docs/html/training/design-navigation/ancestral-temporal.jd
index 6febea7..d12fd5c 100644
--- a/docs/html/training/design-navigation/ancestral-temporal.jd
+++ b/docs/html/training/design-navigation/ancestral-temporal.jd
@@ -1,5 +1,5 @@
 page.title=Providing Ancestral and Temporal Navigation
-parent.title=Designing Effective and Intuitive App Navigation
+parent.title=Designing Effective Navigation
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/design-navigation/descendant-lateral.jd b/docs/html/training/design-navigation/descendant-lateral.jd
index cd933c2..ebfd913 100644
--- a/docs/html/training/design-navigation/descendant-lateral.jd
+++ b/docs/html/training/design-navigation/descendant-lateral.jd
@@ -1,5 +1,5 @@
 page.title=Providing Descendant and Lateral Navigation
-parent.title=Designing Effective and Intuitive App Navigation
+parent.title=Designing Effective Navigation
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/design-navigation/index.jd b/docs/html/training/design-navigation/index.jd
index 71d8387..e02d52e 100644
--- a/docs/html/training/design-navigation/index.jd
+++ b/docs/html/training/design-navigation/index.jd
@@ -1,8 +1,8 @@
-page.title=Designing Effective and Intuitive App Navigation
+page.title=Designing Effective Navigation
 
 trainingnavtop=true
 startpage=true
-next.title=Planning Screens and their Relationships
+next.title=Planning Screens and Their Relationships
 next.link=screen-planning.html
 
 @jd:body
@@ -30,7 +30,8 @@ next.link=screen-planning.html
 
 
 <dl>
-  <dt><strong><a href="screen-planning.html">Planning Screens and their Relationships</a></strong></dt>
+  <dt><strong><a href="screen-planning.html">Planning Screens and Their
+Relationships</a></strong></dt>
     <dd>Learn how to choose which screens your application should contain. Also learn how to choose which screens should be directly reachable from others. This lesson introduces a hypothetical news application to serve as an example for later lessons.</dd>
 
   <dt><strong><a href="multiple-sizes.html">Planning for Multiple Touchscreen Sizes</a></strong></dt>
@@ -42,6 +43,6 @@ next.link=screen-planning.html
   <dt><strong><a href="ancestral-temporal.html">Providing Ancestral and Temporal Navigation</a></strong></dt>
     <dd>Learn how to allow users to navigate upwards in the content hierarchy. Also learn about best practices for the BACK button and temporal navigation, or navigation to previous screens that may not be hierarchically related.</dd>
 
-  <dt><strong><a href="wireframing.html">Putting it All Together: Wireframing the Example Application</a></strong></dt>
+  <dt><strong><a href="wireframing.html">Putting it All Together: Wireframing the Example App</a></strong></dt>
     <dd>Learn how to create screen wireframes (low-fidelity graphic mockups) representing the screens in a news application based on the desired information model. These wireframes utilize navigational elements discussed in previous lessons to demonstrate intuitive and efficient navigation.</dd>
 </dl>
diff --git a/docs/html/training/design-navigation/multiple-sizes.jd b/docs/html/training/design-navigation/multiple-sizes.jd
index d0707d4..3011562 100644
--- a/docs/html/training/design-navigation/multiple-sizes.jd
+++ b/docs/html/training/design-navigation/multiple-sizes.jd
@@ -1,9 +1,9 @@
 page.title=Planning for Multiple Touchscreen Sizes
-parent.title=Designing Effective and Intuitive App Navigation
+parent.title=Designing Effective Navigation
 parent.link=index.html
 
 trainingnavtop=true
-previous.title=Planning Screens and their Relationships
+previous.title=Planning Screens and Their Relationships
 previous.link=screen-planning.html
 next.title=Providing Descendant and Lateral Navigation
 next.link=descendant-lateral.html
diff --git a/docs/html/training/design-navigation/screen-planning.jd b/docs/html/training/design-navigation/screen-planning.jd
index c83aea6..66bb752 100644
--- a/docs/html/training/design-navigation/screen-planning.jd
+++ b/docs/html/training/design-navigation/screen-planning.jd
@@ -1,5 +1,5 @@
-page.title=Planning Screens and their Relationships
-parent.title=Designing Effective and Intuitive App Navigation
+page.title=Planning Screens and Their Relationships
+parent.title=Designing Effective Navigation
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/design-navigation/wireframing.jd b/docs/html/training/design-navigation/wireframing.jd
index e5a8d23..5d0c1cb 100644
--- a/docs/html/training/design-navigation/wireframing.jd
+++ b/docs/html/training/design-navigation/wireframing.jd
@@ -1,5 +1,5 @@
-page.title=Putting it All Together: Wireframing the Example Application
-parent.title=Designing Effective and Intuitive App Navigation
+page.title=Putting it All Together: Wireframing the Example App
+parent.title=Designing Effective Navigation
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/enterprise/device-management-policy.jd b/docs/html/training/enterprise/device-management-policy.jd
index 52f0e37..7b7e0d8 100644
--- a/docs/html/training/enterprise/device-management-policy.jd
+++ b/docs/html/training/enterprise/device-management-policy.jd
@@ -1,5 +1,5 @@
 page.title=Enhancing Security with Device Management Policies
-parent.title=Developing Android Applications for the Enterprise
+parent.title=Developing for Enterprise
 parent.link=index.html
 @jd:body
 
diff --git a/docs/html/training/improving-layouts/loading-ondemand.jd b/docs/html/training/improving-layouts/loading-ondemand.jd
index 659b1ec..0fa2855 100644
--- a/docs/html/training/improving-layouts/loading-ondemand.jd
+++ b/docs/html/training/improving-layouts/loading-ondemand.jd
@@ -1,5 +1,5 @@
 page.title=Loading Views On Demand
-parent.title=Improving Performance of Layouts
+parent.title=Improving Layout Performance
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/improving-layouts/optimizing-layout.jd b/docs/html/training/improving-layouts/optimizing-layout.jd
index 3237780..65c8af7 100644
--- a/docs/html/training/improving-layouts/optimizing-layout.jd
+++ b/docs/html/training/improving-layouts/optimizing-layout.jd
@@ -1,5 +1,5 @@
 page.title=Optimizing Layout Hierarchies
-parent.title=Improving Performance of Layouts
+parent.title=Improving Layout Performance
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/improving-layouts/reusing-layouts.jd b/docs/html/training/improving-layouts/reusing-layouts.jd
index 8f9729a..095b0dd 100644
--- a/docs/html/training/improving-layouts/reusing-layouts.jd
+++ b/docs/html/training/improving-layouts/reusing-layouts.jd
@@ -1,5 +1,5 @@
 page.title=Re-using Layouts with &lt;include/&gt;
-parent.title=Improving Performance of Layouts
+parent.title=Improving Layout Performance
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/improving-layouts/smooth-scrolling.jd b/docs/html/training/improving-layouts/smooth-scrolling.jd
index bc90dd2..0afa929 100644
--- a/docs/html/training/improving-layouts/smooth-scrolling.jd
+++ b/docs/html/training/improving-layouts/smooth-scrolling.jd
@@ -1,5 +1,5 @@
 page.title=Making ListView Scrolling Smooth
-parent.title=Optimizing Performance of Layouts
+parent.title=Improving Layout Performance
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/managing-audio/audio-focus.jd b/docs/html/training/managing-audio/audio-focus.jd
index 07a4465..66649e8 100644
--- a/docs/html/training/managing-audio/audio-focus.jd
+++ b/docs/html/training/managing-audio/audio-focus.jd
@@ -1,5 +1,5 @@
 page.title=Managing Audio Focus
-parent.title=Managing Audio Playback and Focus
+parent.title=Managing Audio Playback
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/managing-audio/audio-output.jd b/docs/html/training/managing-audio/audio-output.jd
index d5d7e4b..416e519 100644
--- a/docs/html/training/managing-audio/audio-output.jd
+++ b/docs/html/training/managing-audio/audio-output.jd
@@ -1,5 +1,5 @@
 page.title=Dealing with Audio Output Hardware
-parent.title=Managing Audio Playback and Focus
+parent.title=Managing Audio Playback
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/managing-audio/volume-playback.jd b/docs/html/training/managing-audio/volume-playback.jd
index 7038ddf..76abbb6 100644
--- a/docs/html/training/managing-audio/volume-playback.jd
+++ b/docs/html/training/managing-audio/volume-playback.jd
@@ -1,5 +1,5 @@
 page.title=Controlling Your App’s Volume and Playback
-parent.title=Managing Audio Playback and Focus
+parent.title=Managing Audio Playback
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/monetization/ads-and-ux.jd b/docs/html/training/monetization/ads-and-ux.jd
index 2fec6f2..d3ab676 100644
--- a/docs/html/training/monetization/ads-and-ux.jd
+++ b/docs/html/training/monetization/ads-and-ux.jd
@@ -1,5 +1,5 @@
 page.title=Advertising without Compromising User Experience
-parent.title=Monetizing your App
+parent.title=Monetizing Your App
 parent.link=index.html
 @jd:body
 
diff --git a/docs/html/training/monitoring-device-state/battery-monitoring.jd b/docs/html/training/monitoring-device-state/battery-monitoring.jd
index a442140..6e25df8 100644
--- a/docs/html/training/monitoring-device-state/battery-monitoring.jd
+++ b/docs/html/training/monitoring-device-state/battery-monitoring.jd
@@ -1,5 +1,5 @@
 page.title=Monitoring the Battery Level and Charging State
-parent.title=Monitoring Device State to Optimize Battery Life
+parent.title=Optimizing Battery Life
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
index 4c71279..98ba63c 100644
--- a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
+++ b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd
@@ -1,5 +1,5 @@
 page.title=Determining and Monitoring the Connectivity Status
-parent.title=Monitoring Device State to Optimize Battery Life
+parent.title=Optimizing Battery Life
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/monitoring-device-state/docking-monitoring.jd b/docs/html/training/monitoring-device-state/docking-monitoring.jd
index 6a4a9a8..392ce30 100644
--- a/docs/html/training/monitoring-device-state/docking-monitoring.jd
+++ b/docs/html/training/monitoring-device-state/docking-monitoring.jd
@@ -1,5 +1,5 @@
 page.title=Determining and Monitoring the Docking State and Type
-parent.title=Monitoring Device State to Optimize Battery Life
+parent.title=Optimizing Battery Life
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/monitoring-device-state/manifest-receivers.jd b/docs/html/training/monitoring-device-state/manifest-receivers.jd
index bf5462a..556a733 100644
--- a/docs/html/training/monitoring-device-state/manifest-receivers.jd
+++ b/docs/html/training/monitoring-device-state/manifest-receivers.jd
@@ -1,5 +1,5 @@
 page.title=Manipulating Broadcast Receivers On Demand
-parent.title=Monitoring Device State to Optimize Battery Life
+parent.title=Optimizing Battery Life
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/multiple-apks/api.jd b/docs/html/training/multiple-apks/api.jd
index 292e5d0..d8588d4 100644
--- a/docs/html/training/multiple-apks/api.jd
+++ b/docs/html/training/multiple-apks/api.jd
@@ -1,5 +1,5 @@
 page.title=Creating Multiple APKs for Different API Levels
-parent.title=Creating and Maintaining Multiple APKs
+parent.title=Maintaining Multiple APKs
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/multiple-apks/index.jd b/docs/html/training/multiple-apks/index.jd
index eee926c..f9b2b43 100644
--- a/docs/html/training/multiple-apks/index.jd
+++ b/docs/html/training/multiple-apks/index.jd
@@ -1,4 +1,4 @@
-page.title=Creating and Maintaining Multiple APKs
+page.title=Maintaining Multiple APKs
 
 trainingnavtop=true
 startpage=true
diff --git a/docs/html/training/multiple-apks/multiple.jd b/docs/html/training/multiple-apks/multiple.jd
index f872379..9795cb1 100644
--- a/docs/html/training/multiple-apks/multiple.jd
+++ b/docs/html/training/multiple-apks/multiple.jd
@@ -1,5 +1,5 @@
 page.title=Creating Multiple APKs with 2+ Dimensions
-parent.title=Creating and Maintaining Multiple APKs
+parent.title=Maintaining Multiple APKs
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/multiple-apks/screensize.jd b/docs/html/training/multiple-apks/screensize.jd
index 28611ec..0ed972a 100644
--- a/docs/html/training/multiple-apks/screensize.jd
+++ b/docs/html/training/multiple-apks/screensize.jd
@@ -1,5 +1,5 @@
 page.title=Creating Multiple APKs for Different Screen Sizes
-parent.title=Creating and Maintaining Multiple APKs
+parent.title=Maintaining Multiple APKs
 parent.link=index.html
 
 trainingnavtop=true
diff --git a/docs/html/training/multiple-apks/texture.jd b/docs/html/training/multiple-apks/texture.jd
index 6f75ef3..2bbe511 100644
--- a/docs/html/training/multiple-apks/texture.jd
+++ b/docs/html/training/multiple-apks/texture.jd
@@ -1,5 +1,5 @@
 page.title=Creating Multiple APKs for Different GL Textures
-parent.title=Creating and Maintaining Multiple APKs
+parent.title=Maintaining Multiple APKs
 parent.link=index.html
 
 trainingnavtop=true