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
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 -->