Merge "String changes for Location services Settings screen Bug: 5098817"

3 files changed, 15 insertions, 24 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2302dcb..bdb86a6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2009,32 +2009,26 @@
 
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</string>
-    <!-- Security & location settings screen, setting check box label if the user wants to use wireless network-based positioning (cell ID, wifi, etc.) -->
-    <string name="location_network_based">Use wireless networks</string>
-    <!-- Security & location settings screen, setting summary when Use wireless networks check box is clear -->
-    <string name="location_networks_disabled">See location in applications (such as Maps) using wireless networks</string>
-    <!-- Security & location settings screen, setting summary when Use wireless networks check box is selected -->
-    <string name="location_neighborhood_level">Location determined by Wi-Fi and/or mobile networks</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">Google location service</string>
+    <!-- [CHAR LIMIT=100] Security & location settings screen, setting summary for Google location service check box-->
+    <string name="location_neighborhood_level">Let apps use Wi-Fi and mobile networks to determine your approximate location</string>
     <!-- Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices [CHAR LIMIT=100] -->
     <string name="location_neighborhood_level_wifi">Location determined by Wi-Fi</string>
-    <!-- Security & location settings screen, setting check box label if the GPS receiver should be enabled -->
-    <string name="location_gps">Use GPS satellites</string>
-    <!-- [CHAR LIMIT=100] Security & location settings screen, setting summary when Use GPS satellites check box is selected -->
-    <string name="location_street_level">When locating, accurate to street level</string>
-    <!-- Security & location settings screen, setting summary when Use GPS satellites check box is clear -->
-    <string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
+    <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+    <string name="location_gps">GPS satellites</string>
+    <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites -->
+    <string name="location_street_level">Let apps use GPS to pinpoint your location</string>
     <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
     <string name="assisted_gps">Use assisted GPS</string>
     <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
     <string name="assisted_gps_enabled">Use server to assist GPS (uncheck to reduce network usage)</string>
     <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
     <string name="assisted_gps_disabled">Use server to assist GPS (uncheck to improve GPS performance)</string>
-    <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box label if the user wants to use their location for Google Search & other Google services -->
-    <string name="use_location_title">Use location for Google Search</string>
-    <!-- [CHAR_LIMIT=100] Security & location settings screen, setting summary when Use My Location for Google services is clear -->
-    <string name="use_location_summary_disabled">Use location for Google Search and other Google services</string>
-    <!-- [CHAR_LIMIT=100] Security & location settings screen, setting summary when Use My Location for Google services is checked -->
-    <string name="use_location_summary_enabled">Location used to improve Google Search results and other Google services</string>
+    <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+    <string name="use_location_title">Location &amp; Google search</string>
+    <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+    <string name="use_location_summary">Let Google use your location to improve search results and other services</string>
 
     <!-- About --> <skip />
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 94133d0..8d8757d 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -20,14 +20,12 @@
         <CheckBoxPreference
             android:key="location_network"
             android:title="@string/location_network_based"
-            android:summaryOn="@string/location_neighborhood_level"
-            android:summaryOff="@string/location_networks_disabled"/>
+            android:summary="@string/location_neighborhood_level"/>
 
         <CheckBoxPreference
             android:key="location_gps"
             android:title="@string/location_gps"
-            android:summaryOn="@string/location_street_level"
-            android:summaryOff="@string/location_gps_disabled"/>
+            android:summary="@string/location_street_level"/>
 
 <!-- Disabled to avoid confusion on devices with no AGPS
      For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index 645e6d7..0824aab 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -90,8 +90,7 @@ public class LocationSettings extends SettingsPreferenceFragment
             CheckBoxPreference useLocation = new CheckBoxPreference(getActivity());
             useLocation.setKey(KEY_USE_LOCATION);
             useLocation.setTitle(R.string.use_location_title);
-            useLocation.setSummaryOn(R.string.use_location_summary_enabled);
-            useLocation.setSummaryOff(R.string.use_location_summary_disabled);
+            useLocation.setSummary(R.string.use_location_summary);
             useLocation.setChecked(
                     GoogleLocationSettingHelper.getUseLocationForServices(getActivity())
                     == GoogleLocationSettingHelper.USE_LOCATION_FOR_SERVICES_ON);