diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-24 02:29:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-24 02:29:43 -0700 |
| commit | 9df03ef1e92cf0dc519e28a115e31df6afa9b553 (patch) | |
| tree | 588dbfe3c209966a3e0a7a518f491973f1a6da31 /src | |
| parent | 6f0e7ba85a144bb84c58b373f5ace9222b1f9761 (diff) | |
| parent | c6f577f3020db0bfef6e87365d43c2f566a93a83 (diff) | |
| download | packages_apps_browser-9df03ef1e92cf0dc519e28a115e31df6afa9b553.zip packages_apps_browser-9df03ef1e92cf0dc519e28a115e31df6afa9b553.tar.gz packages_apps_browser-9df03ef1e92cf0dc519e28a115e31df6afa9b553.tar.bz2 | |
Merge change 22080 into eclair
* changes:
Fixes a bug in the browser settings menu. Correctly hooks up 'Clear location access'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserYesNoPreference.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index aa54ccd..fd35269 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -133,8 +133,8 @@ class BrowserSettings extends Observable { public final static String PREF_DEFAULT_ZOOM = "default_zoom"; public final static String PREF_DEFAULT_TEXT_ENCODING = "default_text_encoding"; - public final static String PREF_CLEAR_LOCATION_ACCESS = - "privacy_clear_location_access"; + public final static String PREF_CLEAR_GEOLOCATION_ACCESS = + "privacy_clear_geolocation_access"; private static final String DESKTOP_USERAGENT = "Mozilla/5.0 (Macintosh; " + "U; Intel Mac OS X 10_5_7; en-us) AppleWebKit/530.17 (KHTML, " + diff --git a/src/com/android/browser/BrowserYesNoPreference.java b/src/com/android/browser/BrowserYesNoPreference.java index e380e57..caea092 100644 --- a/src/com/android/browser/BrowserYesNoPreference.java +++ b/src/com/android/browser/BrowserYesNoPreference.java @@ -51,7 +51,7 @@ class BrowserYesNoPreference extends YesNoPreference { getKey())) { BrowserSettings.getInstance().resetDefaultPreferences(context); setEnabled(true); - } else if (BrowserSettings.PREF_CLEAR_LOCATION_ACCESS.equals( + } else if (BrowserSettings.PREF_CLEAR_GEOLOCATION_ACCESS.equals( getKey())) { BrowserSettings.getInstance().clearLocationAccess(context); } |