summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorSean Cotter <cotter@google.com>2011-08-02 16:16:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-02 16:16:11 -0700
commitceba6ef5a6c92f711f4961b0355e81f8d6d1c624 (patch)
treeb645b5ce9abd16530bd36f07c3fb55e874975559 /res/xml
parent8d7f9594cdcfd3e88c67db195aca6accc3c10274 (diff)
parentee52a4253b5ac284577d79bc35d29705e63e6ce8 (diff)
downloadpackages_apps_Settings-ceba6ef5a6c92f711f4961b0355e81f8d6d1c624.zip
packages_apps_Settings-ceba6ef5a6c92f711f4961b0355e81f8d6d1c624.tar.gz
packages_apps_Settings-ceba6ef5a6c92f711f4961b0355e81f8d6d1c624.tar.bz2
Merge "String changes for Location services Settings screen Bug: 5098817"
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/location_settings.xml6
1 files changed, 2 insertions, 4 deletions
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.