am 0574c26c: am cabe7e82: Merge "Settings app supports location settings injection" into klp-dev

* commit '0574c26c36b1b760d80107fb4171cdcb642aabf1':
  Settings app supports location settings injection
This commit is contained in:
Tom O'Neill
2013-08-13 17:37:55 -07:00
committed by Android Git Automerger
4 changed files with 355 additions and 0 deletions

View File

@@ -2391,6 +2391,9 @@
<string name="location_mode_battery_saving_description">Use Wi\u2011Fi and mobile networks to estimate location</string>
<!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
<string name="location_mode_sensors_only_description">Use GPS to pinpoint your location</string>
<!-- [CHAR LIMIT=130] Location mode screen, temporary value to show as the status of a location
setting injected by an external app while the app is being queried for the actual value -->
<string name="location_loading_injected_setting">Retrieving…</string>
<!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
<string name="location_network_based">Wi\u2011Fi &amp; mobile network location</string>