PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5ed2c4ad: Listen for changes to location pProvider enabled settings.

Browse Source 
Merge commit '5ed2c4ad43f2c3c85a025da04becd2eaa75927a1'

* commit '5ed2c4ad43f2c3c85a025da04becd2eaa75927a1':
  Listen for changes to location pProvider enabled settings.
This commit is contained in:
Mike Lockwood
2009-06-08 07:53:56 -07:00
committed by The Android Open Source Project
parent 53f0e8a45b 5ed2c4ad43
commit f39e714f24
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/SecuritySettings.java
View File

@@ -18,9 +18,11 @@ package com.android.settings;
import android.app.Activity; import android.app.Activity;
import android.content.ContentQueryMap;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.Cursor;
import android.location.LocationManager; import android.location.LocationManager;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
@@ -32,6 +34,9 @@ import android.provider.Settings;
import android.util.Config; import android.util.Config;
import android.util.Log; import android.util.Log;
import java.util.Observable;
import java.util.Observer;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
/** /**
@@ -62,6 +67,16 @@ public class SecuritySettings extends PreferenceActivity {
private CheckBoxPreference mNetwork; private CheckBoxPreference mNetwork;
private CheckBoxPreference mGps; private CheckBoxPreference mGps;
// 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 final class SettingsObserver implements Observer {
public void update(Observable o, Object arg) {
updateToggles();
}
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -74,6 +89,14 @@ public class SecuritySettings extends PreferenceActivity {
mNetwork = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_NETWORK); mNetwork = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_NETWORK);
mGps = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_GPS); mGps = (CheckBoxPreference) getPreferenceScreen().findPreference(LOCATION_GPS);
updateToggles(); updateToggles();
// 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);
mContentQueryMap.addObserver(new SettingsObserver());
} }
private PreferenceScreen createPreferenceHierarchy() { private PreferenceScreen createPreferenceHierarchy() {