cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [14/14] android commit: Make unit tests compile on 4.0.x (couple APIs changed)
Date Tue, 20 Jan 2015 20:04:21 GMT
Make unit tests compile on 4.0.x (couple APIs changed)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/076e9318
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/076e9318
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/076e9318

Branch: refs/heads/4.0.x
Commit: 076e93184b1339c63adc703c12af601695992d68
Parents: c352b29
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Jan 20 15:03:46 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Jan 20 15:03:46 2015 -0500

----------------------------------------------------------------------
 test/src/org/apache/cordova/test/menus.java        | 2 +-
 test/src/org/apache/cordova/test/splashscreen.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/076e9318/test/src/org/apache/cordova/test/menus.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/menus.java b/test/src/org/apache/cordova/test/menus.java
index 9bde03e..4c65ed5 100755
--- a/test/src/org/apache/cordova/test/menus.java
+++ b/test/src/org/apache/cordova/test/menus.java
@@ -34,7 +34,7 @@ public class menus extends CordovaActivity {
         super.onCreate(savedInstanceState);
         // need the title to be shown (config.xml) for the options menu to be visible
         super.init();
-        super.registerForContextMenu(super.appView);
+        super.registerForContextMenu(super.appView.getView());
         super.loadUrl("file:///android_asset/www/menus/index.html");
     }
 

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/076e9318/test/src/org/apache/cordova/test/splashscreen.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/splashscreen.java b/test/src/org/apache/cordova/test/splashscreen.java
index 50a94a9..34051bb 100755
--- a/test/src/org/apache/cordova/test/splashscreen.java
+++ b/test/src/org/apache/cordova/test/splashscreen.java
@@ -30,6 +30,6 @@ public class splashscreen extends CordovaActivity {
         // Show splashscreen
         preferences.set("splashscreen", "sandy");
 
-        super.loadUrl("file:///android_asset/www/splashscreen/index.html", 2000);
+        super.loadUrl("file:///android_asset/www/splashscreen/index.html");
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message