diff options
| author | Joe Malin <jmalin@google.com> | 2013-05-13 23:34:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-13 23:34:47 -0700 |
| commit | 39069b6e82fa848608d56b4efc8f28785816fe27 (patch) | |
| tree | fce07dc6c519063bdffcb6638b56bf5e42475d25 /location/java/android | |
| parent | b4e1c8572aeee78a91f340c9607d3e934adae030 (diff) | |
| parent | efb3726c226001149c92d48fa50da7031c231490 (diff) | |
| download | frameworks_base-39069b6e82fa848608d56b4efc8f28785816fe27.zip frameworks_base-39069b6e82fa848608d56b4efc8f28785816fe27.tar.gz frameworks_base-39069b6e82fa848608d56b4efc8f28785816fe27.tar.bz2 | |
am efb3726c: am 2b8f3734: am e3c549fc: am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs
* commit 'efb3726c226001149c92d48fa50da7031c231490':
Android U: Making Apps Location-Aware
Diffstat (limited to 'location/java/android')
| -rw-r--r-- | location/java/android/location/package.html | 15 |
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} |