diff options
29 files changed, 88 insertions, 56 deletions
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index 3e7fed029d5f..067575aa526d 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -8,7 +8,7 @@ <span class="en">Orientation</span> </a> </li> - + <li class="toggle-list"> <div><a href="<?cs var:toroot ?>training/multiscreen/index.html"> <span class="en">Designing for Multiple Screens</span> @@ -96,42 +96,43 @@ </li> </ul> </li> - + + <li class="toggle-list"> - <div><a href="<?cs var:toroot ?>training/id-auth/index.html"> - <span class="en">Identifying Users</span> + <div><a href="<?cs var:toroot ?>training/sharing/index.html"> + <span class="en">Sharing Content</span> </a></div> <ul> - <li><a href="<?cs var:toroot ?>training/id-auth/identify.html"> - <span class="en">Identifying Your User</span> + <li><a href="<?cs var:toroot ?>training/sharing/send.html"> + <span class="en">Sending Content to Other Apps</span> </a> </li> - <li><a href="<?cs var:toroot ?>training/id-auth/authenticate.html"> - <span class="en">Authenticating to OAuth2 Services</span> + <li><a href="<?cs var:toroot ?>training/sharing/receive.html"> + <span class="en">Receiving Content from Other Apps</span> </a> </li> - <li><a href="<?cs var:toroot ?>training/id-auth/custom_auth.html"> - <span class="en">Creating a Custom Account Type</span> + <li><a href="<?cs var:toroot ?>training/sharing/shareaction.html"> + <span class="en">Adding an Easy Share Action</span> </a> </li> </ul> </li> <li class="toggle-list"> - <div><a href="<?cs var:toroot ?>training/sharing/index.html"> - <span class="en">Sharing Content</span> + <div><a href="<?cs var:toroot ?>training/camera/index.html"> + <span class="en">Capturing Photos</span> </a></div> <ul> - <li><a href="<?cs var:toroot ?>training/sharing/send.html"> - <span class="en">Sending Content to Other Apps</span> + <li><a href="<?cs var:toroot ?>training/camera/photobasics.html"> + <span class="en">Taking Photos Simply</span> </a> </li> - <li><a href="<?cs var:toroot ?>training/sharing/receive.html"> - <span class="en">Receiving Content from Other Apps</span> + <li><a href="<?cs var:toroot ?>training/camera/videobasics.html"> + <span class="en">Recording Videos Simply</span> </a> </li> - <li><a href="<?cs var:toroot ?>training/sharing/shareaction.html"> - <span class="en">Adding an Easy Share Action</span> + <li><a href="<?cs var:toroot ?>training/camera/cameradirect.html"> + <span class="en">Controlling the Camera</span> </a> </li> </ul> @@ -184,6 +185,34 @@ </li> </ul> </li> + + <li class="toggle-list"> + <div><a href="<?cs var:toroot ?>training/design-navigation/index.html"> + <span class="en">Designing Effective Navigation</span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/design-navigation/screen-planning.html"> + <span class="en">Planning Screens and Their Relationships</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/design-navigation/multiple-sizes.html"> + <span class="en">Planning for Multiple Touchscreen Sizes</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/design-navigation/descendant-lateral.html"> + <span class="en">Providing Descendant and Lateral Navigation</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/design-navigation/ancestral-temporal.html"> + <span class="en">Providing Ancestral and Temporal Navigation</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/design-navigation/wireframing.html"> + <span class="en">Putting it All Together: Wireframing the Example App</span> + </a> + </li> + </ul> + </li> </ul> </li> diff --git a/docs/html/training/camera/cameradirect.jd b/docs/html/training/camera/cameradirect.jd index 1e25d4fd1e16..03ad119bbde6 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 31adfe8df365..d209c7e41186 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 002dec728721..e6ab43e37fd0 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 a0f57325dbbb..a3512b01f094 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 6febea723d48..d12fd5caf0c7 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 cd933c2d5c76..ebfd913fe848 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 71d838725891..e02d52eb279f 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 d0707d4952dc..30115620a8a7 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 c83aea67333c..66bb7523d7cf 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 e5a8d2327eaf..5d0c1cb0fe90 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 52f0e37027bf..7b7e0d89ff38 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 659b1ec3cd7d..0fa2855e4a1c 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 3237780b88e5..65c8af798fd1 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 8f9729ac7d68..095b0dd0d9ad 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 <include/> -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 bc90dd2fa415..0afa929ccad1 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 07a4465f2bed..66649e8ac34b 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 d5d7e4b97e0c..416e5193f569 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 7038ddfbd782..76abbb6a17e8 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 2fec6f224b4b..d3ab676fea72 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 a442140aaad8..6e25df82356e 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 4c7127905939..98ba63cc6b6c 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 6a4a9a8e1a91..392ce30d2ba7 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 bf5462a1e7c3..556a733e4ee4 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 292e5d0488ee..d8588d411cc4 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 eee926c147e4..f9b2b43aa8bf 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 f8723797e3f4..9795cb1399cc 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 28611ec2026d..0ed972a94433 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 6f75ef347e63..2bbe511c6d87 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 |