summaryrefslogtreecommitdiffstats
path: root/location
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2014-10-07 22:48:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-07 22:48:59 +0000
commit786037ee25b1e8119af73df72b265f70df726651 (patch)
treec21fd53aaa1218d1328ffe9d25fd355d0ca4b273 /location
parentf2017fdd55b50442faec4e3f57284432c32bf2d2 (diff)
parent11735a0b759b79e6737b512f69f2efa0603d4e3f (diff)
downloadframeworks_base-786037ee25b1e8119af73df72b265f70df726651.zip
frameworks_base-786037ee25b1e8119af73df72b265f70df726651.tar.gz
frameworks_base-786037ee25b1e8119af73df72b265f70df726651.tar.bz2
am 11735a0b: am 61e6d40b: am 5b5bc109: am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
* commit '11735a0b759b79e6737b512f69f2efa0603d4e3f': docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
Diffstat (limited to 'location')
-rw-r--r--location/java/android/location/package.html30
1 files changed, 14 insertions, 16 deletions
diff --git a/location/java/android/location/package.html b/location/java/android/location/package.html
index 81fcea4..2355e72 100644
--- a/location/java/android/location/package.html
+++ b/location/java/android/location/package.html
@@ -1,22 +1,20 @@
<html>
<body>
-<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>Contains the framework API classes that define Android location-based and
+ related services.</p>
+<p class="warning">
+<strong>This API is not the recommended method for accessing Android location.</strong><br>
+The
+<a href="{@docRoot}reference/com/google/android/gms/location/package-summary.html">Google Location Services API</a>,
+part of Google Play services, is the preferred way to add location-awareness to
+your app. It offers a simpler API, higher accuracy, low-power geofencing, and
+more. If you are currently using the android.location API, you are strongly
+encouraged to switch to the Google Location Services API as soon as
+possible.
+<br><br>
+To learn more about the Google Location Services API, see the
+<a href="{@docRoot}google/play-services/location.html">Location API overview</a>.
</p>
-
-<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}
-
</body>
</html>