AI 144256: Need to show opt-in screen for location collection.

Added a screen to the setup wizard, after login, to ask user to
  opt-in for location collection.
  Added a dialog to Settings when user turns on Network location.
  Fixed a security permission issue in LocationManagerService related
  to this change.
  BUG=1752566

Automated import of CL 144256
This commit is contained in:
Amith Yamasani
2009-04-02 11:39:09 -07:00
committed by The Android Open Source Project
parent 4220a1bdc1
commit 55eb6580af
2 changed files with 50 additions and 9 deletions

View File

@@ -1078,6 +1078,14 @@
<string name="location_street_level">When locating, accurate to street level (deselect to conserve battery)</string>
<!-- Security & location settings screen, setting summary when Enable GPS satellites check box is clear -->
<string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
<!-- Title of warning dialog to user that location information will be logged -->
<string name="location_warning_title">Location consent</string>
<!-- Warning text to user that location information will be logged -->
<string name="location_warning_message">"Allow Google's location service to collect anonymous and aggregate location data. Collection will occur regardless of whether any applications are active."</string>
<!-- Agree button-->
<string name="agree">Agree</string>
<!-- Disagree button-->
<string name="disagree">Disagree</string>
<!-- About -->
<!-- Main settings screen, setting title for the user to go into the About phone screen -->