From d13308674b4ff614b6ade32efde0d7cff6d8dc2a Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Sun, 7 Jun 2009 20:11:39 -0400 Subject: [PATCH] Remove Network Location" opt-in dialog from "Security and Settings" This dialog is being moved to the Network Location Provider itself. Signed-off-by: Mike Lockwood --- res/values-cs/strings.xml | 4 -- res/values-de/strings.xml | 4 -- res/values-es-rUS/strings.xml | 8 ---- res/values-es/strings.xml | 4 -- res/values-fr/strings.xml | 4 -- res/values-it/strings.xml | 4 -- res/values-ja/strings.xml | 4 -- res/values-ko/strings.xml | 4 -- res/values-nb/strings.xml | 8 ---- res/values-nl/strings.xml | 4 -- res/values-pl/strings.xml | 4 -- res/values-ru/strings.xml | 4 -- res/values-zh-rCN/strings.xml | 8 ---- res/values-zh-rTW/strings.xml | 4 -- res/values/strings.xml | 7 --- .../android/settings/SecuritySettings.java | 44 ++----------------- 16 files changed, 3 insertions(+), 116 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index edfebf53f03..5507d59d45d 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -490,10 +490,6 @@ "Zapnout přijímač systému GPS" "Zaměření je s přesností na úrovni ulic (zrušením této volby lze šetřit baterii)" "Umožňuje zaměřit na úrovni ulic (vetší spotřeba baterie a nutný výhled na oblohu)" - "Svolení se sběrem dat o poloze" - "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í." - "Souhlasím" - "Nesouhlasím" "Info o telefonu" "Zobrazuje právní informace, stav telefonu a verzi softwaru" "Právní informace" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 1153ff16115..a936059a53d 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -490,10 +490,6 @@ "GPS-Satelliten aktivieren" "Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)" "Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)" - "Standortgenehmigung" - "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." - "Zustimmen" - "Ablehnen" "Telefoninfo" "Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen" "Rechtliche Hinweise" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 511ac2fc203..9aa86af5e96 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -513,14 +513,6 @@ "Activar satélites de GPS" "Localizar con una precisión del nivel de calle (deseleccionar para conservar la batería)" "Localizar a nivel de calle (requiere más batería además de la vista del cielo)" - - - - - - - - "Acerca del teléfono" "Ver información legal, estado del teléfono, versión de software" "Información legal" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5cef4efe85c..5e6c4257ede 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -490,10 +490,6 @@ "Habilitar satélites GPS" "Preciso en el nivel de calle (anula la selección para ahorrar batería)" "Localizar en nivel de calle (requiere más batería además de la vista aérea)" - "Consentimiento de ubicación" - "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." - "Acepto" - "No acepto" "Acerca del teléfono" "Ver información legal, estado del teléfono, versión del software" "Información legal" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 80fa2ecabe3..26abe663d98 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -490,10 +490,6 @@ "Activer les satellites GPS" "Localisation précise au niveau de la rue lors du positionnement géographique (désélectionner pour économiser la batterie)" "Localiser au niveau rue (requiert + de batterie et une vue dégagée)" - "Votre lieu va être enregistré." - "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." - "Accepter" - "Refuser" "À propos du téléphone" "Informations légales, état du téléphone et version du logiciel" "Informations légales" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index e5f5fb8d5ba..24a797268ca 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -490,10 +490,6 @@ "Attiva satelliti GPS" "Accuratezza a livello stradale (deseleziona per risparmiare batteria)" "Localizza a livello stradale (richiede più batteria e la vista del cielo)" - "Consenso alla localizzazione" - "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." - "Accetto" - "Non accetto" "Info sul telefono" "Visualizza informazioni legali, stato del telefono, versione del software" "Informazioni legali" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 40529ad4a8c..b94265fc240 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -490,10 +490,6 @@ "GPS機能をONにする" "高精度測位（電池の消費を節約する場合はOFFにしてください）" "高精度測位（電池消費増、電波が良好な場所で使用）" - "位置情報についての同意" - "Googleの位置情報サービスによる匿名化された位置データの収集および集計を許可します。データ収集はアプリケーション起動の有無にかかわらず行われます。" - "同意する" - "同意しない" "端末情報" "端末情報、規約、バージョン情報" "法的情報" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 3bd2a3c6102..f8134629ab9 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -490,10 +490,6 @@ "GPS 위성 사용" "도로 수준으로 정확하게 탐색(배터리를 절약하려면 선택 취소)" "도로 수준으로 탐색(항공사진이 더해져 배터리 추가로 필요)" - "위치 정보 수집에 동의" - "Google의 위치 서비스가 익명의 위치 데이터를 광범위하게 수집합니다. 사용 중인 응용프로그램에 관계 없이 정보가 수집됩니다." - "동의" - "동의하지 않음" "전화기 정보" "법률 정보, 전화기 상태, 소프트웨어 버전 보기" "법률정보" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6271e4d9939..af7bb4c8f86 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -493,14 +493,6 @@ "Bruk GPS-satellitter" "Nøyaktig til gatenivå (slå av for å spare batteri)" "Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)" - - - - - - - - "Om telefonen" "Vis juridisk informasjon, telefonstatus, programvareversjon" "Juridisk informasjon" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 4cb27fb8d76..3a3e40a21a8 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -490,10 +490,6 @@ "GPS-satellieten inschakelen" "Bij locatie bepalen nauwkeurig tot op straatniveau (deselecteren om acculading te sparen)" "Locatie bepalen tot op straatniveau (meer stroom nodig en weergave van lucht)" - "Locatietoestemming" - "Toestaan dat de locatieservice van Google anonieme, getotaliseerde locatiegegevens verzameld. De gegevens worden verzameld, ongeacht of er toepassingen actief zijn." - "Akkoord" - "Niet akkoord" "Over de telefoon" "Juridische info, telefoonstatus, softwareversie weergeven" "Juridische informatie" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index cc977a35de1..ba3ed9860f4 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -490,10 +490,6 @@ "Użyj satelit GPS" "Ustalanie położenia z dokładnością do ulicy (wyłącz, aby oszczędzać baterię)" "Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)" - "Zgoda na usługę lokalizacji" - "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." - "Zgadzam się" - "Nie zgadzam się" "Informacje o telefonie" "Wyświetl informacje prawne, stan telefonu, wersję oprogramowania" "Informacje prawne" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 283f640f593..ee7d1dce238 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -490,10 +490,6 @@ "Включить спутники GPS" "Определение местоположения с точностью до улицы (для экономии заряда батареи отмените выбор)" "Находить меня до уровня улицы (требуется больше заряда батареи, а также прямая видимость неба)" - "Разрешение на отслеживание местоположения" - "Разрешить Google собирать данные о местоположении без идентификации личной информации. Данные будут собираться, даже если не будет запущено ни одного приложения." - "Принимаю" - "Не принимаю" "О телефоне" "Просмотреть юридические сведения, состояние телефона, версию ПО" "Юридическая информация" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index c4cb2dd5b44..1428b85d3a2 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -491,14 +491,6 @@ "启用 GPS 卫星设置" "定位时，精确到街道级别（取消选择可节约电量）" "定位到街道级别（需要更多电量来观看天空）" - - - - - - - - "关于手机" "查看法律信息、手机状态和软件版本" "法律信息" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index c7bfc0aa03b..bbaae3dfe12 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -490,10 +490,6 @@ "啟用 GPS 衛星接收器" "定位時，精準度設定為街道等級 (取消選取此項可較省電)" "定位至街道等級 (需要更多電力及天候允許)" - "同意記錄位置資訊" - "允許 Google 的定位服務收集匿名綜合位置資料。無論是否有應用程式處於作用中，均會進行收集。" - "同意" - "不同意" "關於手機" "檢視法律資訊、手機狀態、軟體版本" "法律資訊" diff --git a/res/values/strings.xml b/res/values/strings.xml index 08252f62f15..9ea852b6fef 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1108,13 +1108,6 @@ Locate to street-level (requires more battery plus view of sky) - Location consent - - "Allow Google's location service to collect anonymous and aggregate location data. Collection will occur regardless of whether any applications are active." - - Agree - - Disagree diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index b7b382c862a..c6b19ce5287 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -18,9 +18,7 @@ package com.android.settings; 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 @@ import com.android.internal.widget.LockPatternUtils; /** * 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 @@ public class SecuritySettings extends PreferenceActivity 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 @@ public class SecuritySettings extends PreferenceActivity 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 @@ public class SecuritySettings extends PreferenceActivity 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 */