Split Location and Security settings.
Needs final icon for location.
Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
new file mode 100755
index 0000000..4202f5b
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
new file mode 100644
index 0000000..09b0a63
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_location.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3ab1f42..7d4da00 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -599,10 +599,10 @@
<string name="owner_info_settings_summary"></string>
<!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
<string name="owner_info_settings_edit_text_hint">Enter text to display on the lock screen</string>
- <!-- Main Settings screen setting option title for the item to take you the security and location screen -->
- <string name="security_settings_title">Location & security</string>
- <!-- Location & security settings screen title -->
- <string name="location_security_settings_title">Location & security settings</string>
+ <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+ <string name="location_settings_title">Location services</string>
+ <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+ <string name="security_settings_title">Security</string>
<!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
<string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
<!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
new file mode 100644
index 0000000..94133d0
--- /dev/null
+++ b/res/xml/location_settings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/location_settings_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"/>
+-->
+
+</PreferenceScreen>
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>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 4534f82..063d103 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -119,7 +119,14 @@
android:title="@string/sync_settings"
android:id="@+id/sync_settings" />
- <!-- Security & Location -->
+ <!-- Location -->
+ <header
+ android:fragment="com.android.settings.LocationSettings"
+ android:icon="@drawable/ic_settings_location"
+ android:title="@string/location_settings_title"
+ android:id="@+id/location_settings" />
+
+ <!-- Security -->
<header
android:fragment="com.android.settings.SecuritySettings"
android:icon="@drawable/ic_settings_security"
