summaryrefslogtreecommitdiffstats
path: root/location/java/android
diff options
context:
space:
mode:
authorJoe Malin <jmalin@google.com>2013-03-04 10:33:30 -0800
committerJoe Malin <jmalin@google.com>2013-05-13 20:50:22 -0700
commit3ddba7ee37c02c071b6b7580cc21ad8007861ec9 (patch)
tree650df51e23a7aef6a02d319e71b627762d270b80 /location/java/android
parent4da9c11b2758d55c67f7a24c3eb519c36497ba5d (diff)
downloadframeworks_base-3ddba7ee37c02c071b6b7580cc21ad8007861ec9.zip
frameworks_base-3ddba7ee37c02c071b6b7580cc21ad8007861ec9.tar.gz
frameworks_base-3ddba7ee37c02c071b6b7580cc21ad8007861ec9.tar.bz2
Android U: Making Apps Location-Aware
Change-Id: I8f44c6ca6d797ceb8ada5b2c723a8cca0081cf0a
Diffstat (limited to 'location/java/android')
-rw-r--r--location/java/android/location/package.html15
1 files changed, 13 insertions, 2 deletions
diff --git a/location/java/android/location/package.html b/location/java/android/location/package.html
index 2732efc..81fcea4 100644
--- a/location/java/android/location/package.html
+++ b/location/java/android/location/package.html
@@ -1,9 +1,20 @@
<html>
<body>
-<p>Contains classes that define Android location-based and related services.</p>
+<p>Contains the framework API classes that define Android location-based and related services.</p>
+<p class="note">
+ <strong>Note:</strong> The Google Location Services API, part of Google Play
+ Services, provides a more powerful, high-level framework that automates tasks such as
+ location provider choice and power management. Location Services also provides new
+ features such as activity detection that aren't available in the framework API. Developers who
+ are using the framework API, as well as developers who are just now adding location-awareness
+ to their apps, should strongly consider using the Location Services API.
+<br/>
+ To learn more about the Location Services API, see
+ <a href="{@docRoot}google/play-services/location.html">Location APIs</a>.
+</p>
-<p>For more information, see the
+<p>For more information about the framework API, see the
<a href="{@docRoot}guide/topics/location/index.html">Location and Maps</a> guide.</p>
{@more}