diff options
| author | Eric Gilmore <egilmore@google.com> | 2015-01-13 20:23:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 20:23:29 +0000 |
| commit | 1ff978a2390569d2892f93fb144d04b5252c21b9 (patch) | |
| tree | db98182319e9a1f84b0669071e6fca4da47ab1e9 /docs | |
| parent | bd151d08428d6118422fb3412ca78cb656829d22 (diff) | |
| parent | 979dc00bb9061d4bf448b9880096a323d06f19dd (diff) | |
| download | frameworks_base-1ff978a2390569d2892f93fb144d04b5252c21b9.zip frameworks_base-1ff978a2390569d2892f93fb144d04b5252c21b9.tar.gz frameworks_base-1ff978a2390569d2892f93fb144d04b5252c21b9.tar.bz2 | |
am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs automerge: 1908515
automerge: 979dc00
* commit '979dc00bb9061d4bf448b9880096a323d06f19dd':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/training/location/index.jd | 25 | ||||
| -rw-r--r-- | docs/html/training/training_toc.cs | 12 |
2 files changed, 2 insertions, 35 deletions
diff --git a/docs/html/training/location/index.jd b/docs/html/training/location/index.jd index 059a1e9..35e177f 100644 --- a/docs/html/training/location/index.jd +++ b/docs/html/training/location/index.jd @@ -50,9 +50,8 @@ startpage=true <p> This class shows you how to use the Google Play services location APIs in your - app to get the current location, get periodic location updates, look up - addresses, create and monitor geofences, and detect user activities. The class - includes sample apps and code snippets that you can use as a starting point + app to get the current location, get periodic location updates, and look up + addresses. The class includes sample apps and code snippets that you can use as a starting point for adding location awareness to your app. </p> @@ -81,25 +80,5 @@ startpage=true </dt> <dd> Learn how to convert a location's latitude and longitude into an address (reverse geocoding). - </dd> <dt> - <b> - <a href="geofencing.html">Creating and Monitoring Geofences</a> - </b> - </dt> <dd> - Learn how to define one or more geographic areas as locations of interest, - called geofences, and detect when the user is close to or inside a geofence. - </dd> <dt> - <b><a href="activity-recognition.html">Recognizing the User's Current - Activity</a></b> - </dt> <dd> - Learn how to recognize the user's current activity, such as walking, - bicycling, or driving a car, and how to use this information to modify your - app's location strategy. - </dd> <dt> - <b><a href="location-testing.html">Testing Using Mock Locations</a></b> - </dt> <dd> - Learn how to test a location-aware app by injecting mock locations into - Location Services. In mock mode, Location Services sends out mock locations - that you inject instead of sensor-based locations. </dd> </dl> diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index 082f5ff..0fcfb9c 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -707,18 +707,6 @@ include the action bar on devices running Android 2.1 or higher." Displaying a Location Address </a> </li> - <li><a href="<?cs var:toroot ?>training/location/geofencing.html"> - Creating and Monitoring Geofences - </a> - </li> - <li><a href="<?cs var:toroot ?>training/location/activity-recognition.html"> - Recognizing the User's Current Activity - </a> - </li> - <li><a href="<?cs var:toroot ?>training/location/location-testing.html"> - Testing Using Mock Locations - </a> - </li> </ul> </li> </ul> |