diff options
| author | Lifu Tang <lifu@google.com> | 2013-08-08 00:55:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-08 00:55:39 +0000 |
| commit | b14698ee6063960d48a691add890a5072f89ea2e (patch) | |
| tree | 76e1ce40e906f3e2142a4a4b670be3cc988501e2 /res | |
| parent | 71decb7b072d69613083285cee6014d37b2e6ef8 (diff) | |
| parent | e63142329060fabe105a8fd939cb637d530ae4a3 (diff) | |
| download | packages_apps_Settings-b14698ee6063960d48a691add890a5072f89ea2e.tar.gz packages_apps_Settings-b14698ee6063960d48a691add890a5072f89ea2e.tar.bz2 packages_apps_Settings-b14698ee6063960d48a691add890a5072f89ea2e.zip | |
Merge "Finished the location settings"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 8 | ||||
| -rw-r--r-- | res/xml/location_settings.xml | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d20fabca..6b9cf74e4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2362,17 +2362,19 @@ <string name="location_mode_battery_saving_title">Battery saving</string> <!-- [CHAR LIMIT=30] Location settings screen, device sensors only location mode --> <string name="location_mode_sensors_only_title">Device sensors only</string> + <!-- [CHAR LIMIT=30] Location settings screen, location off mode --> + <string name="location_mode_location_off_title">Location off</string> <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests --> <string name="location_category_recent_location_requests">Recent location requests</string> <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services --> <string name="location_category_location_services">Location services</string> <!-- [CHAR LIMIT=30] Location mode screen, screen title --> <string name="location_mode_screen_title">Location mode</string> - <!-- [CHAR LIMIT=30] Location mode screen, description for high accuracy mode --> + <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode --> <string name="location_mode_high_accuracy_description">Use GPS, Wi\u2011Fi and mobile networks to estimate location </string> - <!-- [CHAR LIMIT=30] Location mode screen, description for battery saving mode --> + <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode --> <string name="location_mode_battery_saving_description">Use Wi\u2011Fi and mobile networks to estimate location</string> - <!-- [CHAR LIMIT=30] Location mode screen, description for sensors only mode --> + <!-- [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=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) --> diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml index 293b7722d..e646cab3a 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -22,7 +22,7 @@ <PreferenceScreen android:key="location_mode" android:title="@string/location_mode_title" - android:summary="@string/location_mode_high_accuracy_title" /> + android:summary="@string/location_mode_location_off_title" /> <PreferenceCategory android:key="recent_location_requests" |