Revert "WARNING! Removing references to API Level 8 entities. "
This reverts commit 6914bf6909537da5e467f5c1d61cdcd630565c0d.
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java
index 9b777b5..7687209 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowWebSettings.java
@@ -18,7 +18,7 @@
private boolean loadWithOverviewMode = false;
private boolean needInitialFocus = false;
private boolean pluginsEnabled = false;
-// private WebSettings.PluginState pluginState = WebSettings.PluginState.OFF;
+ private WebSettings.PluginState pluginState = WebSettings.PluginState.OFF;
private boolean supportMultipleWindows = false;
private boolean supportZoom = true;
@@ -131,15 +131,15 @@
pluginsEnabled = flag;
}
-// @Implementation
-// public synchronized WebSettings.PluginState getPluginState() {
-// return pluginState;
-// }
-//
-// @Implementation
-// public synchronized void setPluginState(WebSettings.PluginState state) {
-// pluginState = state;
-// }
+ @Implementation
+ public synchronized WebSettings.PluginState getPluginState() {
+ return pluginState;
+ }
+
+ @Implementation
+ public synchronized void setPluginState(WebSettings.PluginState state) {
+ pluginState = state;
+ }
public boolean getSupportMultipleWindows() {
return supportMultipleWindows;
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java
index 131bcbb..9662b60 100644
--- a/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java
+++ b/src/test/java/com/xtremelabs/robolectric/shadows/WebSettingsTest.java
@@ -38,7 +38,7 @@
assertThat(webSettings.getLoadWithOverviewMode(), equalTo(false));
assertThat(shadowWebSettings.getNeedInitialFocus(), equalTo(false));
assertThat(webSettings.getPluginsEnabled(), equalTo(false));
-// assertThat(webSettings.getPluginState(), equalTo(WebSettings.PluginState.OFF));
+ assertThat(webSettings.getPluginState(), equalTo(WebSettings.PluginState.OFF));
assertThat(shadowWebSettings.getSupportMultipleWindows(), equalTo(false));
assertThat(shadowWebSettings.getSupportZoom(), equalTo(true));
}
@@ -131,19 +131,19 @@
}
}
-// @Test
-// public void testPluginState() {
-// WebSettings.PluginState[] states = {
-// WebSettings.PluginState.OFF,
-// WebSettings.PluginState.ON,
-// WebSettings.PluginState.ON_DEMAND
-// };
-//
-// for (WebSettings.PluginState state : states) {
-// webSettings.setPluginState(state);
-// assertThat(webSettings.getPluginState(), equalTo(state));
-// }
-// }
+ @Test
+ public void testPluginState() {
+ WebSettings.PluginState[] states = {
+ WebSettings.PluginState.OFF,
+ WebSettings.PluginState.ON,
+ WebSettings.PluginState.ON_DEMAND
+ };
+
+ for (WebSettings.PluginState state : states) {
+ webSettings.setPluginState(state);
+ assertThat(webSettings.getPluginState(), equalTo(state));
+ }
+ }
@Test
public void testSupportMultipleWindows() {