summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserSettings.java
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-08-04 02:38:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-04 02:38:31 -0700
commitffa738f87f1113fc977277767df637a9581fa9a2 (patch)
tree14464d94ad316600d03730fc6060924018e46831 /src/com/android/browser/BrowserSettings.java
parent5d513105dff9f453872be40f8bed2391396cf9c7 (diff)
parentdc657fa17179878ecf536ad1cb6e8891c4aab29e (diff)
downloadandroid_packages_apps_Gello-ffa738f87f1113fc977277767df637a9581fa9a2.tar.gz
android_packages_apps_Gello-ffa738f87f1113fc977277767df637a9581fa9a2.tar.bz2
android_packages_apps_Gello-ffa738f87f1113fc977277767df637a9581fa9a2.zip
Merge "Fix BrowserSettings to apply blockPopupWindows() correctly"
Diffstat (limited to 'src/com/android/browser/BrowserSettings.java')
-rw-r--r--src/com/android/browser/BrowserSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 11972ee2..b3f7689c 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -235,7 +235,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
settings.setTextZoom(getTextZoom());
settings.setAutoFillEnabled(isAutofillEnabled());
settings.setLayoutAlgorithm(getLayoutAlgorithm());
- settings.setJavaScriptCanOpenWindowsAutomatically(blockPopupWindows());
+ settings.setJavaScriptCanOpenWindowsAutomatically(!blockPopupWindows());
settings.setLoadsImagesAutomatically(loadImages());
settings.setLoadWithOverviewMode(loadPageInOverviewMode());
settings.setSavePassword(rememberPasswords());