commit e536b33d74896d8b71f0a8537eab734fda8db2fd
author Patrick Scott <phanna@android.com> Mon Mar 22 10:19:32 2010 -0400
committer Patrick Scott <phanna@android.com> Tue Mar 23 14:32:56 2010 -0400
tree 5d8192ddf1d843f36b5fa4130a54f2584460df3b
parent 93bea966f525c15a5c23caac771399a0be6fc3f1

Add the on-demand setting for plugins.

Requires a change to webkit and the framework.

Bug: 2411524
Change-Id: I874e4e2139eedf4bc9332947fe6513b027e660d9

res/xml/browser_preferences.xml

diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml
index 04c0ebe..ee1b306 100644
--- a/res/xml/browser_preferences.xml
+++ b/res/xml/browser_preferences.xml
@@ -78,10 +78,13 @@
                 android:defaultValue="true"
                 android:title="@string/pref_content_javascript" />     
 
-        <CheckBoxPreference
-                android:key="enable_plugins"
-                android:defaultValue="true"
-                android:title="@string/pref_content_plugins" />
+        <ListPreference
+                android:key="plugin_state"
+                android:title="@string/pref_content_plugins"
+                android:defaultValue="ON"
+                android:entries="@array/pref_content_plugins_choices"
+                android:entryValues="@array/pref_content_plugins_values"
+                android:dialogTitle="@string/pref_content_plugins" />
 
         <CheckBoxPreference
                 android:key="open_in_background"