From a6a8a1479b970d8a84395453703348fe42d17438 Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Thu, 9 Jun 2011 11:56:17 -0700
Subject: [PATCH] Split Location and Security settings.

Needs final icon for location.

Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86
---
 AndroidManifest.xml                           |  24 ++-
 res/drawable-hdpi/ic_settings_location.png    | Bin 0 -> 1314 bytes
 res/drawable-mdpi/ic_settings_location.png    | Bin 0 -> 955 bytes
 res/values/strings.xml                        |   8 +-
 res/xml/location_settings.xml                 |  41 ++++
 res/xml/security_settings.xml                 |  29 +--
 res/xml/settings_headers.xml                  |   9 +-
 .../settings/GoogleLocationSettingHelper.java |   1 +
 .../android/settings/LocationSettings.java    | 193 ++++++++++++++++++
 .../android/settings/SecuritySettings.java    | 129 +-----------
 src/com/android/settings/Settings.java        |   2 +-
 11 files changed, 274 insertions(+), 162 deletions(-)
 create mode 100755 res/drawable-hdpi/ic_settings_location.png
 create mode 100644 res/drawable-mdpi/ic_settings_location.png
 create mode 100644 res/xml/location_settings.xml
 create mode 100644 src/com/android/settings/LocationSettings.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bebc37a685c..c85772758cc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -620,15 +620,33 @@
                 android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
         </activity>
 
+        <activity android:name="Settings$LocationSettingsActivity"
+                android:theme="@android:style/Theme.Holo"
+                android:label="@string/location_settings_title"
+                android:configChanges="orientation|keyboardHidden"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
+                <action android:name="android.credentials.UNLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.LocationSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/location_settings" />
+        </activity>
+
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:theme="@android:style/Theme.Holo"
-                android:label="@string/location_security_settings_title"
+                android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SECURITY_SETTINGS" />
-                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
                 <action android:name="android.credentials.UNLOCK" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -684,7 +702,7 @@
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/security_settings" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/location_security_settings_title" />
+                android:resource="@string/security_settings_title" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
                 android:value="com.android.settings.Settings$SecuritySettingsActivity" />
         </activity>
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
new file mode 100755
index 0000000000000000000000000000000000000000..4202f5b3ab057f7c80ae3b50abe22c6374a47897
GIT binary patch
literal 1314
zcmV+-1>O3IP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00002VoOIv0RM-N
z%)bBt010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?000CkNkl<Z
zSi|j?&yN&E7>1wfo?UT46OCxHm<7}<iO~awb@iZu;KdMK<X|*-mzV%v{6k2@cp}C~
zyx_^iC@ykA6Zx?x<6!~4Xo4(y5f*lKx*rc+)6+fEGfObag_@+NyWX$rtE%^_x4wdV
z<!+Zy|8yvLCrID7-I^2$<m6q0h$JLyAX!lnnjF~s?hYv_I%@bDhLo*)E?Rx_kqP$m
z9M|}qpKDEXHt`Nma+%NgolqOb)4at-7C6pw1?gXX6LGU=)l9wRo8p+MspH~|S0i%O
z=f&|7ne%2u&bqnir`bUePpB)d+E)K?QVa$$b)kYRn3l+-SJbwvuBa!9ewsK4$YWgO
z0VDu938z`)KBU7&UL%RtlJg}?v<R#)%`S2hKmva=%@sn=N2}sWCP-_pXL&Xfw~nMn
z>nq%f$V41aQBuZfE(S62yxLYfW@gTcW46RiE~%?#uBuCJ5?hXmvu5UY%xtR{OvKRS
z08?>~nVOraM<VgX^RSvl<Zy`u@xzE{+gFQznjIA8yZlaF^gYKSk-=ah?sMLY&bv=c
zN+g*2uHSpfubhp240TY<VoE(Ej!ESgL>#ZYSCPc=_)pzINnPmrp+;vFNeQ&0l+<=B
zDbnuk>Coh0P&E(&p@(GgHS1azD3-`T_caH0A8D`Ns>hTBNeXN&WMChZx|ne*j-_s%
z6eB0=E=7riL8Kv0OS-mrR6XNMH8O)Z<1xSXW4HInjBmUB)NefEQ=_9O5qEg4jOzDm
z`(UqajnO_Qwql6l!E)zZbH{M8D@Hr7uBaXLhSM?P@j)-EZ9A^0m)sz6cT9V|g3K55
zZQuZaDP9D|fRqjs>}HV!$(Z2@jEHRITmFh+yP5S7Nq`r4oZlKrUZeES`VsCYA<*HW
zT778Zx4J~9DoeENwuU8YtH1bQxkTGsj`l0+ss1JECway{8%R#YH(ZS*uevwZ75E3Y
zM{+k9xB8KK#+L`ebk<{@_7i7oVwZ?J{XsqImfI7%$tZT?HAzc`ycc$d)X8#QO(e%;
zAP3gPh^S{jIVq6EXB{c**TLFi*A=t8Qr8o^oIu{|zS31rDTbrPuG%UPr&~%|PYh$d
zefEP9o%D5Iitd2pA~76CvaU+^mAva@bQJCMl)C5vTYX37oF`rMq;s_>!j=bIROj6}
zI*LXg`h}$B=IX&3a-`fjnR|vG`lHj9$-cB@vX-`Fc4E8p{b@_@oJ`2s%1>n?C4ps@
z%fxGaX)SQ0l6ciyJj1Ufq2#euStGa^&nBYzk1=)3c$n8KSzpG<sHR2g*gL{<ZVq92
z&E)q&L{>&7zhCqxzf}i`IOVy2k-ndEs$cBtxk^Abu%GQL4O~DRc>#HwM_J%F*9#;J
zaqu5pq5i*1V9iMbc&FFcd*$wze*hAToSU#CHFW?003~!qSaf7zbY(hYa%Ew3WdJfT
zF)=MLF)cDNR53I<GBG+aG%YYVIxsK+_Y7eG001R)MObuXVRU6WZEs|0W_bWIFflPL
zFflDMF;p=$Ix;ajF*GeOI65#eaH_Q30000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
YQe|Oed2z{QJOBUy07*qoM6N<$f{o`~P5=M^

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..09b0a63a73d15afb1ef60b21f30e71920b67421d
GIT binary patch
literal 955
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE>PQHPZ!4!kK;$D?(dFu6*+Ei{N8t-;k!*;C-oxM
z2rZhR6s@8q7<AO>KZBtL$I7j|Dl3H#swD|GABou6)X}wMv$5-u8yaED0?k(J7Py#n
z_s#D2XOBNR`}gC$bu2kW?C<6pf4@_F{^z;x)ogNKMAi7CPoG?}#%0a&&2n3ve^>HP
z^vI}D+WGBeOSbK@IJRRt8$8qmI$c=iCFt+GG4YIy_t))nj~r3h_cC_-o+P2gJ6>Gp
z`+IfzkqnXe;=9##Z{|o?wcZq-A6~j-Ug^cddOtg(R+h(nT;N}IX#drPRgQ1`jb4~v
zkYU^A*<*QL+9hG8U}Kl+zDM#YjqWQ1B4(~jnDn9R@T7y89}PeL{j~q~yYl(`l^1#^
zUA}47EY+;B@74Rfs(VtCE7$LO#ydaPpyJ~Dy^pPzMe+ztt~hr7NQwqCyW7hf7ackM
z#ha_blN7sHXS%qm7%WTkTA*Z@wekuZ#{sjQ&YK)qpY+Ww%v#DPU=Xme{kg>vMl%i%
zh2lBWe|DZf>B6MUHYaJO{*Q?b+X{Ie9ljS-dU!dv()uZ}KLdK$K6;z(e#^P>slg3#
z|CP?|ua*iuXsbG(^ECDTw<h_O%G<B_ADy>5!N7X;!MW-aW;!$Nm6fyhsz_VblHICa
z@z>r<Ly>LWuV(gBcI+Q_h}Ygt*^+P6_5N3PdzPAsD#xT7&#Z-{RkR$G%y)9S7)idE
z{BxS}on_}&tXu4>!pxlHt~RM-$+DzIyUZw$!YngIFAZibq2yyn`wSjF$m2~_T6X`=
zml$^+`5n*9<+6{IT$;ajkIBWuf1lP=w$HiVJ?H${PYRPPy|j3r+Mc`MJWWz?WkpwX
zjv}{>AL{|`%{DjoE?ql~=bDYt<x6_+ax@%kPTSx8)b;nb$<?cQ!Mwcl7%QjPt}(Zs
z{Bq-w_?)t^XE%?_m+(zDWB4L**|wXhG3K2~gsI#@?K%JJx7hx89Umi>A$69gp&FR3
zRZCnWN>UO_QmvAUQh^kMk%6J1u7RPhkzt6TiItI|m7$5QfrXWU0poX`L=+9V`6-!c
zmAEw&tlDxHs6i5BLvVgtNqJ&XDuZK6ep0G}XKrG8YEWuoN@d~6R2!fo22WQ%mvv4F
FO#mM+m$U!?

literal 0
HcmV?d00001

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3ab1f423da5..7d4da0026f2 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 &amp; security</string>
-    <!-- Location & security settings screen title -->
-    <string name="location_security_settings_title">Location &amp; 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 00000000000..94133d08a9a
--- /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 d0e200a577f..228b7f1e3ee 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 4534f8263ee..063d103313f 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"
diff --git a/src/com/android/settings/GoogleLocationSettingHelper.java b/src/com/android/settings/GoogleLocationSettingHelper.java
index 0d4861e36e5..be4a02cc127 100644
--- a/src/com/android/settings/GoogleLocationSettingHelper.java
+++ b/src/com/android/settings/GoogleLocationSettingHelper.java
@@ -122,6 +122,7 @@ public class GoogleLocationSettingHelper {
         try {
             context.startActivity(i);
         } catch (ActivityNotFoundException e) {
+            Log.e("GoogleLocationSettingHelper", "Problem while starting GSF location activity");
         }
     }
 
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
new file mode 100644
index 00000000000..645e6d7724b
--- /dev/null
+++ b/src/com/android/settings/LocationSettings.java
@@ -0,0 +1,193 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+
+import android.content.ContentQueryMap;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.location.LocationManager;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+
+import java.util.Observable;
+import java.util.Observer;
+
+/**
+ * Gesture lock pattern settings.
+ */
+public class LocationSettings extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener {
+
+    // Location Settings
+    private static final String KEY_LOCATION_NETWORK = "location_network";
+    private static final String KEY_LOCATION_GPS = "location_gps";
+    private static final String KEY_ASSISTED_GPS = "assisted_gps";
+    private static final String KEY_USE_LOCATION = "location_use_for_services";
+
+    private CheckBoxPreference mNetwork;
+    private CheckBoxPreference mGps;
+    private CheckBoxPreference mAssistedGps;
+    private CheckBoxPreference mUseLocation;
+
+    // These provide support for receiving notification when Location Manager settings change.
+    // This is necessary because the Network Location Provider can change settings
+    // if the user does not confirm enabling the provider.
+    private ContentQueryMap mContentQueryMap;
+
+    private Observer mSettingsObserver;
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        // listen for Location Manager settings changes
+        Cursor settingsCursor = getContentResolver().query(Settings.Secure.CONTENT_URI, null,
+                "(" + Settings.System.NAME + "=?)",
+                new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED},
+                null);
+        mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mSettingsObserver != null) {
+            mContentQueryMap.deleteObserver(mSettingsObserver);
+        }
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.location_settings);
+        root = getPreferenceScreen();
+
+        mNetwork = (CheckBoxPreference) root.findPreference(KEY_LOCATION_NETWORK);
+        mGps = (CheckBoxPreference) root.findPreference(KEY_LOCATION_GPS);
+        mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
+        if (GoogleLocationSettingHelper.isAvailable(getActivity())) {
+            // GSF present, Add setting for 'Use My Location'
+            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.setChecked(
+                    GoogleLocationSettingHelper.getUseLocationForServices(getActivity())
+                    == GoogleLocationSettingHelper.USE_LOCATION_FOR_SERVICES_ON);
+            useLocation.setPersistent(false);
+            useLocation.setOnPreferenceChangeListener(this);
+            getPreferenceScreen().addPreference(useLocation);
+            mUseLocation = useLocation;
+        }
+
+        // Change the summary for wifi-only devices
+        if (Utils.isWifiOnly()) {
+            mNetwork.setSummaryOn(R.string.location_neighborhood_level_wifi);
+        }
+
+        return root;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Make sure we reload the preference hierarchy since some of these settings
+        // depend on others...
+        createPreferenceHierarchy();
+        updateLocationToggles();
+
+        if (mSettingsObserver == null) {
+            mSettingsObserver = new Observer() {
+                public void update(Observable o, Object arg) {
+                    updateLocationToggles();
+                }
+            };
+            mContentQueryMap.addObserver(mSettingsObserver);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        if (preference == mNetwork) {
+            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
+                    LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
+        } else if (preference == mGps) {
+            boolean enabled = mGps.isChecked();
+            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
+                    LocationManager.GPS_PROVIDER, enabled);
+            if (mAssistedGps != null) {
+                mAssistedGps.setEnabled(enabled);
+            }
+        } else if (preference == mAssistedGps) {
+            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED,
+                    mAssistedGps.isChecked() ? 1 : 0);
+        } else {
+            // If we didn't handle it, let preferences handle it.
+            return super.onPreferenceTreeClick(preferenceScreen, preference);
+        }
+
+        return true;
+    }
+
+    /*
+     * Creates toggles for each available location provider
+     */
+    private void updateLocationToggles() {
+        ContentResolver res = getContentResolver();
+        boolean gpsEnabled = Settings.Secure.isLocationProviderEnabled(
+                res, LocationManager.GPS_PROVIDER);
+        mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
+                res, LocationManager.NETWORK_PROVIDER));
+        mGps.setChecked(gpsEnabled);
+        if (mAssistedGps != null) {
+            mAssistedGps.setChecked(Settings.Secure.getInt(res,
+                    Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
+            mAssistedGps.setEnabled(gpsEnabled);
+        }
+    }
+
+    /**
+     * see confirmPatternThenDisableAndClear
+     */
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        createPreferenceHierarchy();
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object value) {
+        if (preference == mUseLocation) {
+            boolean newValue = (value == null ? false : (Boolean) value);
+            GoogleLocationSettingHelper.setUseLocationForServices(getActivity(), newValue);
+            // We don't want to change the value immediately here, since the user may click
+            // disagree in the dialog that pops up. When the activity we just launched exits, this
+            // activity will be restated and the new value re-read, so the checkbox will get its
+            // new value then.
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5d77e5333ed..fc91e78492f 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -19,15 +19,9 @@ package com.android.settings;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
-import com.android.internal.widget.LockPatternUtils;
-
 import android.app.admin.DevicePolicyManager;
-import android.content.ContentQueryMap;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
-import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
@@ -41,9 +35,9 @@ import android.security.KeyStore;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import com.android.internal.widget.LockPatternUtils;
+
 import java.util.ArrayList;
-import java.util.Observable;
-import java.util.Observer;
 
 /**
  * Gesture lock pattern settings.
@@ -60,38 +54,17 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
 
-    // Location Settings
-    private static final String KEY_LOCATION_CATEGORY = "location_category";
-    private static final String KEY_LOCATION_NETWORK = "location_network";
-    private static final String KEY_LOCATION_GPS = "location_gps";
-    private static final String KEY_ASSISTED_GPS = "assisted_gps";
-    private static final String KEY_USE_LOCATION = "location_use_for_services";
-
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
     private static final String KEY_SHOW_PASSWORD = "show_password";
     private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
 
-    private static final String TAG = "SecuritySettings";
-
-    private CheckBoxPreference mNetwork;
-    private CheckBoxPreference mGps;
-    private CheckBoxPreference mAssistedGps;
-    private CheckBoxPreference mUseLocation;
-
     DevicePolicyManager mDPM;
 
-    // These provide support for receiving notification when Location Manager settings change.
-    // This is necessary because the Network Location Provider can change settings
-    // if the user does not confirm enabling the provider.
-    private ContentQueryMap mContentQueryMap;
-
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private LockPatternUtils mLockPatternUtils;
     private ListPreference mLockAfter;
 
-    private Observer mSettingsObserver;
-
     private CheckBoxPreference mVisiblePattern;
     private CheckBoxPreference mTactileFeedback;
 
@@ -110,25 +83,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        // listen for Location Manager settings changes
-        Cursor settingsCursor = getContentResolver().query(Settings.Secure.CONTENT_URI, null,
-                "(" + Settings.System.NAME + "=?)",
-                new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED},
-                null);
-        mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mSettingsObserver != null) {
-            mContentQueryMap.deleteObserver(mSettingsObserver);
-        }
-    }
-
     private PreferenceScreen createPreferenceHierarchy() {
         PreferenceScreen root = getPreferenceScreen();
         if (root != null) {
@@ -137,32 +91,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         addPreferencesFromResource(R.xml.security_settings);
         root = getPreferenceScreen();
 
-        mNetwork = (CheckBoxPreference) root.findPreference(KEY_LOCATION_NETWORK);
-        mGps = (CheckBoxPreference) root.findPreference(KEY_LOCATION_GPS);
-        mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
-        if (GoogleLocationSettingHelper.isAvailable(getActivity())) {
-            // GSF present, Add setting for 'Use My Location'
-            PreferenceGroup locationCat =
-                    (PreferenceGroup) root.findPreference(KEY_LOCATION_CATEGORY);
-            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.setChecked(
-                    GoogleLocationSettingHelper.getUseLocationForServices(getActivity())
-                    == GoogleLocationSettingHelper.USE_LOCATION_FOR_SERVICES_ON);
-            useLocation.setPersistent(false);
-            useLocation.setOnPreferenceChangeListener(this);
-            locationCat.addPreference(useLocation);
-            mUseLocation = useLocation;
-        }
-
-        // Change the summary for wifi-only devices
-        if (Utils.isWifiOnly()) {
-            mNetwork.setSummaryOn(R.string.location_neighborhood_level_wifi);
-        }
-
         // Add options for lock/unlock screen
         int resid = 0;
         if (!mLockPatternUtils.isSecure()) {
@@ -311,16 +239,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         // Make sure we reload the preference hierarchy since some of these settings
         // depend on others...
         createPreferenceHierarchy();
-        updateLocationToggles();
-
-        if (mSettingsObserver == null) {
-            mSettingsObserver = new Observer() {
-                public void update(Observable o, Object arg) {
-                    updateLocationToggles();
-                }
-            };
-            mContentQueryMap.addObserver(mSettingsObserver);
-        }
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
         if (mVisiblePattern != null) {
@@ -338,8 +256,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         final String key = preference.getKey();
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
@@ -355,19 +272,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         } else if (preference == mShowPassword) {
             Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
                     mShowPassword.isChecked() ? 1 : 0);
-        } else if (preference == mNetwork) {
-            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
-                    LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
-        } else if (preference == mGps) {
-            boolean enabled = mGps.isChecked();
-            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
-                    LocationManager.GPS_PROVIDER, enabled);
-            if (mAssistedGps != null) {
-                mAssistedGps.setEnabled(enabled);
-            }
-        } else if (preference == mAssistedGps) {
-            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED,
-                    mAssistedGps.isChecked() ? 1 : 0);
         } else {
             // If we didn't handle it, let preferences handle it.
             return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -376,29 +280,12 @@ public class SecuritySettings extends SettingsPreferenceFragment
         return true;
     }
 
-    /*
-     * Creates toggles for each available location provider
-     */
-    private void updateLocationToggles() {
-        ContentResolver res = getContentResolver();
-        boolean gpsEnabled = Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.GPS_PROVIDER);
-        mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.NETWORK_PROVIDER));
-        mGps.setChecked(gpsEnabled);
-        if (mAssistedGps != null) {
-            mAssistedGps.setChecked(Settings.Secure.getInt(res,
-                    Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
-            mAssistedGps.setEnabled(gpsEnabled);
-        }
-    }
-
     private boolean isToggled(Preference pref) {
         return ((CheckBoxPreference) pref).isChecked();
     }
 
     /**
-     * @see #confirmPatternThenDisableAndClear
+     * see confirmPatternThenDisableAndClear
      */
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -416,14 +303,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 Log.e("SecuritySettings", "could not persist lockAfter timeout setting", e);
             }
             updateLockAfterPreferenceSummary();
-        } else if (preference == mUseLocation) {
-            boolean newValue = (value == null ? false : (Boolean) value);
-            GoogleLocationSettingHelper.setUseLocationForServices(getActivity(), newValue);
-            // We don't want to change the value immediately here, since the user may click
-            // disagree in the dialog that pops up. When the activity we just launched exits, this
-            // activity will be restated and the new value re-read, so the checkbox will get its
-            // new value then.
-            return false;
         }
         return true;
     }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1f54b17a923..102dd7faa6a 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -528,7 +528,6 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
     /*
      * Settings subclasses for launching independently.
      */
-
     public static class BluetoothSettingsActivity extends Settings { /* empty */ }
     public static class WirelessSettingsActivity extends Settings { /* empty */ }
     public static class TetherSettingsActivity extends Settings { /* empty */ }
@@ -550,6 +549,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
     public static class DevelopmentSettingsActivity extends Settings { /* empty */ }
     public static class AccessibilitySettingsActivity extends Settings { /* empty */ }
     public static class SecuritySettingsActivity extends Settings { /* empty */ }
+    public static class LocationSettingsActivity extends Settings { /* empty */ }
     public static class PrivacySettingsActivity extends Settings { /* empty */ }
     public static class DockSettingsActivity extends Settings { /* empty */ }
     public static class RunningServicesActivity extends Settings { /* empty */ }