diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index edfebf5..5507d59 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"Zapnout přijímač systému GPS"</string>
     <string name="location_street_level">"Zaměření je s přesností na úrovni ulic (zrušením této volby lze šetřit baterii)"</string>
     <string name="location_gps_disabled">"Umožňuje zaměřit na úrovni ulic (vetší spotřeba baterie a nutný výhled na oblohu)"</string>
-    <string name="location_warning_title">"Svolení se sběrem dat o poloze"</string>
-    <string name="location_warning_message">"Povolit službě určování polohy společnosti Google sběr anonymních a sdružených dat o poloze. Data budou sbírána bez ohledu na to, zda je nějaká aplikace aktivní."</string>
-    <string name="agree">"Souhlasím"</string>
-    <string name="disagree">"Nesouhlasím"</string>
     <string name="about_settings">"Info o telefonu"</string>
     <string name="about_settings_summary">"Zobrazuje právní informace, stav telefonu a verzi softwaru"</string>
     <string name="legal_information">"Právní informace"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1153ff1..a936059 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"GPS-Satelliten aktivieren"</string>
     <string name="location_street_level">"Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)"</string>
     <string name="location_gps_disabled">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
-    <string name="location_warning_title">"Standortgenehmigung"</string>
-    <string name="location_warning_message">"Erlauben Sie dem Google-Standortservice, anonyme und aggregierte Standortdaten zu erfassen. Die Erfassung wird unabhängig davon durchgeführt, ob Anwendungen aktiv sind oder nicht."</string>
-    <string name="agree">"Zustimmen"</string>
-    <string name="disagree">"Ablehnen"</string>
     <string name="about_settings">"Telefoninfo"</string>
     <string name="about_settings_summary">"Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen"</string>
     <string name="legal_information">"Rechtliche Hinweise"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 511ac2f..9aa86af 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -513,14 +513,6 @@
     <string name="location_gps">"Activar satélites de GPS"</string>
     <string name="location_street_level">"Localizar con una precisión del nivel de calle (deseleccionar para conservar la batería)"</string>
     <string name="location_gps_disabled">"Localizar a nivel de calle (requiere más batería además de la vista del cielo)"</string>
-    <!-- no translation found for location_warning_title (788624242969337259) -->
-    <skip />
-    <!-- no translation found for location_warning_message (2455390825908728808) -->
-    <skip />
-    <!-- no translation found for agree (6288718671527758326) -->
-    <skip />
-    <!-- no translation found for disagree (6221069272309799230) -->
-    <skip />
     <string name="about_settings">"Acerca del teléfono"</string>
     <string name="about_settings_summary">"Ver información legal, estado del teléfono, versión de software"</string>
     <string name="legal_information">"Información legal"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5cef4ef..5e6c425 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"Habilitar satélites GPS"</string>
     <string name="location_street_level">"Preciso en el nivel de calle (anula la selección para ahorrar batería)"</string>
     <string name="location_gps_disabled">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
-    <string name="location_warning_title">"Consentimiento de ubicación"</string>
-    <string name="location_warning_message">"Permite que el servicio de ubicación de Google recopile los datos de ubicación anónimos y globales. La recopilación tiene lugar aunque otras aplicaciones estén activas."</string>
-    <string name="agree">"Acepto"</string>
-    <string name="disagree">"No acepto"</string>
     <string name="about_settings">"Acerca del teléfono"</string>
     <string name="about_settings_summary">"Ver información legal, estado del teléfono, versión del software"</string>
     <string name="legal_information">"Información legal"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 80fa2ec..26abe66 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"Activer les satellites GPS"</string>
     <string name="location_street_level">"Localisation précise au niveau de la rue lors du positionnement géographique (désélectionner pour économiser la batterie)"</string>
     <string name="location_gps_disabled">"Localiser au niveau rue (requiert + de batterie et une vue dégagée)"</string>
-    <string name="location_warning_title">"Votre lieu va être enregistré."</string>
-    <string name="location_warning_message">"Autoriser le service de positionnement géographique de Google à collecter des données de lieu ne permettant pas de vous identifier personnellement. Les données seront collectées, quelles que soient les applications activées."</string>
-    <string name="agree">"Accepter"</string>
-    <string name="disagree">"Refuser"</string>
     <string name="about_settings">"À propos du téléphone"</string>
     <string name="about_settings_summary">"Informations légales, état du téléphone et version du logiciel"</string>
     <string name="legal_information">"Informations légales"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e5f5fb8..24a7972 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"Attiva satelliti GPS"</string>
     <string name="location_street_level">"Accuratezza a livello stradale (deseleziona per risparmiare batteria)"</string>
     <string name="location_gps_disabled">"Localizza a livello stradale (richiede più batteria e la vista del cielo)"</string>
-    <string name="location_warning_title">"Consenso alla localizzazione"</string>
-    <string name="location_warning_message">"Consenti al servizio di localizzazione di Google di raccogliere dati anonimi e aggregati sulla posizione. La raccolta dei dati verrà effettuata a prescindere dal fatto che ci siano o meno applicazioni attive."</string>
-    <string name="agree">"Accetto"</string>
-    <string name="disagree">"Non accetto"</string>
     <string name="about_settings">"Info sul telefono"</string>
     <string name="about_settings_summary">"Visualizza informazioni legali, stato del telefono, versione del software"</string>
     <string name="legal_information">"Informazioni legali"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 40529ad..b94265f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"GPS機能をONにする"</string>
     <string name="location_street_level">"高精度測位（電池の消費を節約する場合はOFFにしてください）"</string>
     <string name="location_gps_disabled">"高精度測位（電池消費増、電波が良好な場所で使用）"</string>
-    <string name="location_warning_title">"位置情報についての同意"</string>
-    <string name="location_warning_message">"Googleの位置情報サービスによる匿名化された位置データの収集および集計を許可します。データ収集はアプリケーション起動の有無にかかわらず行われます。"</string>
-    <string name="agree">"同意する"</string>
-    <string name="disagree">"同意しない"</string>
     <string name="about_settings">"端末情報"</string>
     <string name="about_settings_summary">"端末情報、規約、バージョン情報"</string>
     <string name="legal_information">"法的情報"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3bd2a3c..f813462 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"GPS 위성 사용"</string>
     <string name="location_street_level">"도로 수준으로 정확하게 탐색(배터리를 절약하려면 선택 취소)"</string>
     <string name="location_gps_disabled">"도로 수준으로 탐색(항공사진이 더해져 배터리 추가로 필요)"</string>
-    <string name="location_warning_title">"위치 정보 수집에 동의"</string>
-    <string name="location_warning_message">"Google의 위치 서비스가 익명의 위치 데이터를 광범위하게 수집합니다. 사용 중인 응용프로그램에 관계 없이 정보가 수집됩니다."</string>
-    <string name="agree">"동의"</string>
-    <string name="disagree">"동의하지 않음"</string>
     <string name="about_settings">"전화기 정보"</string>
     <string name="about_settings_summary">"법률 정보, 전화기 상태, 소프트웨어 버전 보기"</string>
     <string name="legal_information">"법률정보"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6271e4d..af7bb4c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -493,14 +493,6 @@
     <string name="location_gps">"Bruk GPS-satellitter"</string>
     <string name="location_street_level">"Nøyaktig til gatenivå (slå av for å spare batteri)"</string>
     <string name="location_gps_disabled">"Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)"</string>
-    <!-- no translation found for location_warning_title (788624242969337259) -->
-    <skip />
-    <!-- no translation found for location_warning_message (2455390825908728808) -->
-    <skip />
-    <!-- no translation found for agree (6288718671527758326) -->
-    <skip />
-    <!-- no translation found for disagree (6221069272309799230) -->
-    <skip />
     <string name="about_settings">"Om telefonen"</string>
     <string name="about_settings_summary">"Vis juridisk informasjon, telefonstatus, programvareversjon"</string>
     <string name="legal_information">"Juridisk informasjon"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4cb27fb..3a3e40a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"GPS-satellieten inschakelen"</string>
     <string name="location_street_level">"Bij locatie bepalen nauwkeurig tot op straatniveau (deselecteren om acculading te sparen)"</string>
     <string name="location_gps_disabled">"Locatie bepalen tot op straatniveau (meer stroom nodig en weergave van lucht)"</string>
-    <string name="location_warning_title">"Locatietoestemming"</string>
-    <string name="location_warning_message">"Toestaan dat de locatieservice van Google anonieme, getotaliseerde locatiegegevens verzameld. De gegevens worden verzameld, ongeacht of er toepassingen actief zijn."</string>
-    <string name="agree">"Akkoord"</string>
-    <string name="disagree">"Niet akkoord"</string>
     <string name="about_settings">"Over de telefoon"</string>
     <string name="about_settings_summary">"Juridische info, telefoonstatus, softwareversie weergeven"</string>
     <string name="legal_information">"Juridische informatie"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cc977a3..ba3ed98 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"Użyj satelit GPS"</string>
     <string name="location_street_level">"Ustalanie położenia z dokładnością do ulicy (wyłącz, aby oszczędzać baterię)"</string>
     <string name="location_gps_disabled">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
-    <string name="location_warning_title">"Zgoda na usługę lokalizacji"</string>
-    <string name="location_warning_message">"Zezwól usłudze lokalizacji Google na zbieranie anonimowych, zbiorczych danych o lokalizacji. Zbieranie danych będzie się odbywać bez względu na to, czy aktywne są aplikacje."</string>
-    <string name="agree">"Zgadzam się"</string>
-    <string name="disagree">"Nie zgadzam się"</string>
     <string name="about_settings">"Informacje o telefonie"</string>
     <string name="about_settings_summary">"Wyświetl informacje prawne, stan telefonu, wersję oprogramowania"</string>
     <string name="legal_information">"Informacje prawne"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 283f640..ee7d1dc 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"Включить спутники GPS"</string>
     <string name="location_street_level">"Определение местоположения с точностью до улицы (для экономии заряда батареи отмените выбор)"</string>
     <string name="location_gps_disabled">"Находить меня до уровня улицы (требуется больше заряда батареи, а также прямая видимость неба)"</string>
-    <string name="location_warning_title">"Разрешение на отслеживание местоположения"</string>
-    <string name="location_warning_message">"Разрешить Google собирать данные о местоположении без идентификации личной информации. Данные будут собираться, даже если не будет запущено ни одного приложения."</string>
-    <string name="agree">"Принимаю"</string>
-    <string name="disagree">"Не принимаю"</string>
     <string name="about_settings">"О телефоне"</string>
     <string name="about_settings_summary">"Просмотреть юридические сведения, состояние телефона, версию ПО"</string>
     <string name="legal_information">"Юридическая информация"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c4cb2dd..1428b85 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -491,14 +491,6 @@
     <string name="location_gps">"启用 GPS 卫星设置"</string>
     <string name="location_street_level">"定位时，精确到街道级别（取消选择可节约电量）"</string>
     <string name="location_gps_disabled">"定位到街道级别（需要更多电量来观看天空）"</string>
-    <!-- no translation found for location_warning_title (788624242969337259) -->
-    <skip />
-    <!-- no translation found for location_warning_message (2455390825908728808) -->
-    <skip />
-    <!-- no translation found for agree (6288718671527758326) -->
-    <skip />
-    <!-- no translation found for disagree (6221069272309799230) -->
-    <skip />
     <string name="about_settings">"关于手机"</string>
     <string name="about_settings_summary">"查看法律信息、手机状态和软件版本"</string>
     <string name="legal_information">"法律信息"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c7bfc0a..bbaae3d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -490,10 +490,6 @@
     <string name="location_gps">"啟用 GPS 衛星接收器"</string>
     <string name="location_street_level">"定位時，精準度設定為街道等級 (取消選取此項可較省電)"</string>
     <string name="location_gps_disabled">"定位至街道等級 (需要更多電力及天候允許)"</string>
-    <string name="location_warning_title">"同意記錄位置資訊"</string>
-    <string name="location_warning_message">"允許 Google 的定位服務收集匿名綜合位置資料。無論是否有應用程式處於作用中，均會進行收集。"</string>
-    <string name="agree">"同意"</string>
-    <string name="disagree">"不同意"</string>
     <string name="about_settings">"關於手機"</string>
     <string name="about_settings_summary">"檢視法律資訊、手機狀態、軟體版本"</string>
     <string name="legal_information">"法律資訊"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 08252f6..9ea852b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1108,13 +1108,6 @@
     <!-- Security & location settings screen, setting summary when Enable GPS satellites check box is clear -->
     <string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
     <!-- Title of warning dialog to user that location information will be logged -->
-    <string name="location_warning_title">Location consent</string>
-    <!-- Warning text to user that location information will be logged -->
-    <string name="location_warning_message">"Allow Google's location service to collect anonymous and aggregate location data.  Collection will occur regardless of whether any applications are active."</string>
-    <!-- Agree button-->
-    <string name="agree">Agree</string>
-    <!-- Disagree button-->
-    <string name="disagree">Disagree</string>
 
     <!-- About -->
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index b7b382c..c6b19ce 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -18,9 +18,7 @@
 
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.location.LocationManager;
@@ -39,8 +37,7 @@
 /**
  * Gesture lock pattern settings.
  */
-public class SecuritySettings extends PreferenceActivity
-    implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+public class SecuritySettings extends PreferenceActivity {
 
     // Lock Settings
     
@@ -64,9 +61,6 @@
 
     private CheckBoxPreference mNetwork;
     private CheckBoxPreference mGps;
-    
-    // To track whether Agree was clicked in the Network location warning dialog
-    private boolean mOkClicked;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -184,22 +178,8 @@
             Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
                     mShowPassword.isChecked() ? 1 : 0);
         } else if (preference == mNetwork) {
-            //normally called on the toggle click
-            if (mNetwork.isChecked()) {
-                // Show a warning to the user that location data will be shared 
-                mOkClicked = false;
-                new AlertDialog.Builder(this).setMessage(
-                        getResources().getString(R.string.location_warning_message))
-                        .setTitle(R.string.location_warning_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setPositiveButton(R.string.agree, this)
-                        .setNegativeButton(R.string.disagree, this)
-                        .show()
-                        .setOnDismissListener(this);
-            } else {
-                Settings.Secure.setLocationProviderEnabled(getContentResolver(),
-                        LocationManager.NETWORK_PROVIDER, false);
-            }
+            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
+                    LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
         } else if (preference == mGps) {
             Settings.Secure.setLocationProviderEnabled(getContentResolver(),
                     LocationManager.GPS_PROVIDER, mGps.isChecked());
@@ -208,24 +188,6 @@
         return false;
     }
 
-    public void onClick(DialogInterface dialog, int which) {
-        if (which == DialogInterface.BUTTON_POSITIVE) {
-            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
-                    LocationManager.NETWORK_PROVIDER, true);
-            mOkClicked = true;
-        } else {
-            // Reset the toggle
-            mNetwork.setChecked(false);
-        }
-    }
-    
-    public void onDismiss(DialogInterface dialog) {
-        // Assuming that onClick gets called first
-        if (!mOkClicked) {
-            mNetwork.setChecked(false);
-        }
-    }
-
     /*
      * Creates toggles for each available location provider
      */