diff options
7 files changed, 19 insertions, 10 deletions
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd index 847163a7acff..dae70a227d1c 100644 --- a/docs/html/training/basics/firstapp/building-ui.jd +++ b/docs/html/training/basics/firstapp/building-ui.jd @@ -56,7 +56,8 @@ but it's especially important on Android because it allows you to define alterna different screen sizes. For example, you can create two versions of a layout and tell the system to use one on "small" screens and the other on "large" screens. For more information, see the class about <a -href="{@docRoot}training/supporting-hardware/index.html">Supporting Various Hardware</a>.</p> +href="{@docRoot}training/basics/supporting-devices/index.html">Supporting Different +Hardware</a>.</p> </div> </div> diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd index 2398fa0895e8..43b898396475 100644 --- a/docs/html/training/basics/firstapp/running-app.jd +++ b/docs/html/training/basics/firstapp/running-app.jd @@ -35,7 +35,7 @@ next.link=building-ui.html </div> -<p>If you followed the <a href="{@docRoot}creating-project.html">previous lesson</a> to create an +<p>If you followed the <a href="creating-project.html">previous lesson</a> to create an Android project, it includes a default set of "Hello World" source files that allow you to run the app right away.</p> diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd index 16a6fd82436e..c548c1de259e 100644 --- a/docs/html/training/basics/firstapp/starting-activity.jd +++ b/docs/html/training/basics/firstapp/starting-activity.jd @@ -128,7 +128,7 @@ can also be <em>implicit</em>, in which case the {@link android.content.Intent} the desired component, but allows any app installed on the device to respond to the intent as long as it satisfies the meta-data specifications for the action that's specified in various {@link android.content.Intent} parameters. For more informations, see the class about <a -href="{@docRoot}training/intents/index.html">Interacting with Other Apps</a>.</p> +href="{@docRoot}training/basics/intents/index.html">Interacting with Other Apps</a>.</p> </div> </div> @@ -301,7 +301,8 @@ on Android 4.0. <p>To learn more about building Android apps, continue to follow the basic training classes. The next class is <a -href="{@docRoot}training/activity-lifecycle/index.html">Managing the Activity Lifecycle</a>.</p> +href="{@docRoot}training/basics/activity-lifecycle/index.html">Managing the Activity +Lifecycle</a>.</p> diff --git a/docs/html/training/basics/fragments/communicating.jd b/docs/html/training/basics/fragments/communicating.jd index b2292b1b1097..e3e308f1bd31 100644 --- a/docs/html/training/basics/fragments/communicating.jd +++ b/docs/html/training/basics/fragments/communicating.jd @@ -4,7 +4,7 @@ parent.link=index.html trainingnavtop=true previous.title=Building a Flexible UI -previous.link=fragment-ui.html +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 9f3ed061a950..c4a9b4686c2c 100644 --- a/docs/html/training/basics/fragments/creating.jd +++ b/docs/html/training/basics/fragments/creating.jd @@ -6,7 +6,7 @@ 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 +next.link=fragment-ui.html @jd:body diff --git a/docs/html/training/basics/fragments/support-lib.jd b/docs/html/training/basics/fragments/support-lib.jd index c26f6c86ed7f..e2166f5db8ff 100644 --- a/docs/html/training/basics/fragments/support-lib.jd +++ b/docs/html/training/basics/fragments/support-lib.jd @@ -63,9 +63,8 @@ API level to the latest release: Android or don't exist in the platform at all and merely provide additional support to you when developing specific application features.</p> -<p>You can find all the API reference documentation for the Support Library included in the -platform docs in the {@link android.support.v4} package. For which API references are available -at {@link android.support.v4}.</p> +<p>You can find all the API reference documentation for the Support Library in the +platform docs at {@link android.support.v4.app android.support.v4.*}.</p> <div class="warning"><p><strong>Warning:</strong> To be sure that you don't accidentally use new APIs on an older system version, be certain that you import the {@link diff --git a/docs/html/training/basics/location/currentlocation.jd b/docs/html/training/basics/location/currentlocation.jd index 4692530e5e98..29b0fa6d20d4 100644 --- a/docs/html/training/basics/location/currentlocation.jd +++ b/docs/html/training/basics/location/currentlocation.jd @@ -143,7 +143,15 @@ private boolean isSameProvider(String provider1, String provider2) { <h2 id="TaskTerminateUpdates">Terminate Location Updates</h2> -<p>When you are done with using location data, you should terminate location update to reduce unnecessary consumption of power and network bandwidth. For example, if the user navigates away from an activity where location updates are displayed, you should stop location update by calling {@link android.location.LocationManager#removeUpdates(android.location.LocationListener) removeUpdates()} in {@link android.app.Activity#onStop()}. ({@link android.app.Activity#onStop()} is called when the activity is no longer visible. If you want to learn more about activity lifecycle, read up on the <a href="/training/basic-activity-lifecycle/stopping.html">Starting and Stopping an Activity</a> lesson.</p> +<p>When you are done with using location data, you should terminate location update to reduce +unnecessary consumption of power and network bandwidth. For example, if the user navigates away +from an activity where location updates are displayed, you should stop location update by calling +{@link android.location.LocationManager#removeUpdates(android.location.LocationListener) +removeUpdates()} in {@link android.app.Activity#onStop()}. ({@link android.app.Activity#onStop()} +is called when the activity is no longer visible. If you want to learn more about activity +lifecycle, read up on the <a +href="{@docRoot}training/basics/activity-lifecycle/stopping.html">Stopping and Restarting an +Activity</a> lesson.</p> <pre> protected void onStop() { |