diff options
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/preferences/AdvancedPreferencesFragment.java | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 0d3bc48..48f1d6f 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -168,6 +168,7 @@ public class BrowserSettings extends Observable implements OnSharedPreferenceCha public final static String PREF_MOST_VISITED_HOMEPAGE = "use_most_visited_homepage"; public final static String PREF_AUTOLOGIN = "enable_autologin"; public final static String PREF_AUTOLOGIN_ACCOUNT = "autologin_account"; + public final static String PREF_PLUGIN_STATE = "plugin_state"; private static final String DESKTOP_USERAGENT = "Mozilla/5.0 (Macintosh; " + "U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/533.16 (KHTML, " + @@ -437,7 +438,7 @@ public class BrowserSettings extends Observable implements OnSharedPreferenceCha javaScriptEnabled = p.getBoolean("enable_javascript", javaScriptEnabled); pluginState = WebSettings.PluginState.valueOf( - p.getString("plugin_state", pluginState.name())); + p.getString(PREF_PLUGIN_STATE, pluginState.name())); javaScriptCanOpenWindowsAutomatically = !p.getBoolean( "block_popup_windows", !javaScriptCanOpenWindowsAutomatically); diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java index dd3a9ca..835778a 100644 --- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java +++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java @@ -21,6 +21,7 @@ import com.android.browser.R; import android.content.res.Resources; import android.os.Bundle; +import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; @@ -60,6 +61,14 @@ public class AdvancedPreferencesFragment extends PreferenceFragment e = findPreference(BrowserSettings.PREF_DEFAULT_TEXT_ENCODING); e.setOnPreferenceChangeListener(this); + + e = findPreference(BrowserSettings.PREF_PLUGIN_STATE); + e.setOnPreferenceChangeListener(this); + updatePluginSummary((ListPreference) e); + } + + void updatePluginSummary(ListPreference e) { + e.setSummary(e.getEntry()); } /* @@ -115,6 +124,11 @@ public class AdvancedPreferencesFragment extends PreferenceFragment getActivity().finish(); return true; } + } else if (pref.getKey().equals(BrowserSettings.PREF_PLUGIN_STATE)) { + ListPreference lp = (ListPreference) pref; + lp.setValue((String) objValue); + updatePluginSummary(lp); + return false; } return false; } |