summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-05-15 07:35:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 07:35:49 -0700
commit997d00428c420ba8c2175c7c2e28f14d54abd0b9 (patch)
treeffc36970ff59484a2ca6fc360fa0fbc6dc24c314 /docs/html/guide
parent8f13a2ad9f68ddb10388e86104868311e5ee2e29 (diff)
parentaa0acfc8761fc8802879f90511b904061a523ed2 (diff)
downloadframeworks_base-997d00428c420ba8c2175c7c2e28f14d54abd0b9.zip
frameworks_base-997d00428c420ba8c2175c7c2e28f14d54abd0b9.tar.gz
frameworks_base-997d00428c420ba8c2175c7c2e28f14d54abd0b9.tar.bz2
am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
* commit 'aa0acfc8761fc8802879f90511b904061a523ed2': Doc change: updates to location landing.
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/topics/sensors/index.jd5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/guide/topics/sensors/index.jd b/docs/html/guide/topics/sensors/index.jd
index 726476a..65560e6 100644
--- a/docs/html/guide/topics/sensors/index.jd
+++ b/docs/html/guide/topics/sensors/index.jd
@@ -1,5 +1,6 @@
-page.title=Location and Sensors
+page.title=Location and Sensors APIs
page.landing=true
+page.tags="location","sensors"
page.landing.intro=Use sensors on the device to add rich location and motion capabilities to your app, from GPS or network location to accelerometer, gyroscope, temperature, barometer, and more.
page.landing.image=
@@ -29,7 +30,7 @@ venues - as well as providing a reasonable level of offline support</p>
<div class="col-6">
<h3>Training</h3>
- <a href="http://developer.android.com/training/basics/location/index.html">
+ <a href="http://developer.android.com/training/location/index.html">
<h4>Making Your App Location Aware</h4>
<p>This class teaches you how to incorporate location based services in your Android
application. You'll learn a number of methods to receive location updates and related best