commit a6a8a1479b970d8a84395453703348fe42d17438
author Gilles Debunne <debunne@google.com> Thu Jun 09 11:56:17 2011 -0700
committer Gilles Debunne <debunne@google.com> Tue Jun 21 16:53:00 2011 -0700
tree 9fb7783f878b0e2cbb955afb11adfcdec29b2aec
parent e78c1879058571c00879f0d3e756951302adf513

Split Location and Security settings.

Needs final icon for location.

Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86

res/xml/security_settings.xml

diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index d0e200a5..228b7f1 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -15,33 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_security_settings_title">
-
-    <PreferenceCategory
-        android:key="location_category"
-        android:title="@string/location_title">
-
-        <CheckBoxPreference
-            android:key="location_network"
-            android:title="@string/location_network_based"
-            android:summaryOn="@string/location_neighborhood_level"
-            android:summaryOff="@string/location_networks_disabled"/>
-
-        <CheckBoxPreference
-            android:key="location_gps"
-            android:title="@string/location_gps"
-            android:summaryOn="@string/location_street_level"
-            android:summaryOff="@string/location_gps_disabled"/>
-
-<!-- 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.
-        <CheckBoxPreference
-            android:key="assisted_gps"
-            android:title="@string/assisted_gps"
-            android:summaryOn="@string/assisted_gps_enabled"
-            android:summaryOff="@string/assisted_gps_disabled"/>
--->
-
-    </PreferenceCategory>
+        android:title="@string/security_settings_title">
 
 </PreferenceScreen>