summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2014-10-04 01:20:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-04 01:20:14 +0000
commitba2199fa8c369d9627a216a4c3ea19497bf9e9c7 (patch)
tree49304fa3283106edcb92f9d02611399d0ddcd5d2
parent2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881 (diff)
parent380dde32a742a993a42cfad9643499da207ff95e (diff)
downloadframeworks_base-ba2199fa8c369d9627a216a4c3ea19497bf9e9c7.zip
frameworks_base-ba2199fa8c369d9627a216a4c3ea19497bf9e9c7.tar.gz
frameworks_base-ba2199fa8c369d9627a216a4c3ea19497bf9e9c7.tar.bz2
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
-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>