diff options
| author | Amith Yamasani <> | 2009-04-02 11:40:25 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 11:40:25 -0700 |
| commit | 4bfdcd3e5fb344cad88feaf4172427f0be53ac2c (patch) | |
| tree | ce8053bd3848dc93f4aa161d822ad302ba246714 /res | |
| parent | f9e024198d3b16454287888bd5d40fee23390d23 (diff) | |
| download | packages_apps_settings-4bfdcd3e5fb344cad88feaf4172427f0be53ac2c.zip packages_apps_settings-4bfdcd3e5fb344cad88feaf4172427f0be53ac2c.tar.gz packages_apps_settings-4bfdcd3e5fb344cad88feaf4172427f0be53ac2c.tar.bz2 | |
AI 144257: am: CL 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.
Original author: yamasani
Merged from: //branches/cupcake/...
Automated import of CL 144257
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b4df5e2..b93dba9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1102,6 +1102,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 --> |