diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index fe677f4b..f7f2be6f 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -57,6 +57,7 @@ public class CordovaWebView extends WebView { public PluginManager pluginManager; public CallbackServer callbackServer; + private boolean paused; /** Actvities and other important classes **/ @@ -817,6 +818,7 @@ public class CordovaWebView extends WebView { // Pause JavaScript timers (including setInterval) this.pauseTimers(); } + paused = true; } @@ -836,6 +838,7 @@ public class CordovaWebView extends WebView { // Resume JavaScript timers (including setInterval) this.resumeTimers(); } + paused = false; } public void handleDestroy() @@ -859,6 +862,11 @@ public class CordovaWebView extends WebView { this.pluginManager.onNewIntent(intent); } } + + public boolean isPaused() + { + return paused; + } public boolean hadKeyEvent() { return handleButton; diff --git a/test/project.properties b/test/project.properties index 9aa0dfa8..895c9ce2 100644 --- a/test/project.properties +++ b/test/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=Google Inc.:Google APIs:15 +target=android-16 diff --git a/test/src/org/apache/cordova/test/CordovaActivityTest.java b/test/src/org/apache/cordova/test/CordovaActivityTest.java index b53f000a..766dd530 100644 --- a/test/src/org/apache/cordova/test/CordovaActivityTest.java +++ b/test/src/org/apache/cordova/test/CordovaActivityTest.java @@ -22,6 +22,7 @@ package org.apache.cordova.test; import org.apache.cordova.CordovaWebView; import com.phonegap.api.PluginManager; +import android.app.Instrumentation; import android.test.ActivityInstrumentationTestCase2; import android.widget.FrameLayout; import android.widget.LinearLayout; @@ -32,6 +33,8 @@ public class CordovaActivityTest extends ActivityInstrumentationTestCase2