Merge "Update strings for location" into pi-dev am: 4aff464a39

am: e139ef5552

Change-Id: I3870629a47447f4ee658604ad4a840303baaeafc
This commit is contained in:
Lei Yu
2018-03-15 19:37:27 +00:00
committed by android-build-merger

View File

@@ -3402,14 +3402,11 @@
<!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
<string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>
<!-- Preference description text for Wi-Fi always scanning -->
<string name="location_scanning_wifi_always_scanning_description">Improve location by allowing
system apps and services to detect Wi\u2011Fi networks at any time.</string>
<string name="location_scanning_wifi_always_scanning_description">Allow apps and services to scan for Wi\u2011Fi networks at any time, even when Wi\u2011Fi is off. This can be used, for example, to improve location-based features and services.</string>
<!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
<string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
<!-- Description text for Bluetooth always scanning -->
<string name="location_scanning_bluetooth_always_scanning_description">
Improve location by allowing system apps and services to detect Bluetooth devices at any
time.</string>
<string name="location_scanning_bluetooth_always_scanning_description">Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.</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>