You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/07/15 22:52:05 UTC
[1/3] android commit: changes the test name to make it auto run
Updated Branches:
refs/heads/master a9ebf50b8 -> 7f5f87ac7
changes the test name to make it auto run
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ae96d567
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ae96d567
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ae96d567
Branch: refs/heads/master
Commit: ae96d5678bc1f27a6fba19e0772028b5941e6826
Parents: a9ebf50
Author: ldeluca <ld...@us.ibm.com>
Authored: Wed Jun 26 13:38:52 2013 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Jul 15 13:46:17 2013 -0700
----------------------------------------------------------------------
test/src/org/apache/cordova/test/UserWebViewTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ae96d567/test/src/org/apache/cordova/test/UserWebViewTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/UserWebViewTest.java b/test/src/org/apache/cordova/test/UserWebViewTest.java
index 12ff161..e7a240a 100644
--- a/test/src/org/apache/cordova/test/UserWebViewTest.java
+++ b/test/src/org/apache/cordova/test/UserWebViewTest.java
@@ -57,7 +57,7 @@ public class UserWebViewTest extends ActivityInstrumentationTestCase2<userwebvie
assertNotNull(testView);
}
- public void customTest()
+ public void testCustom()
{
assertTrue(CordovaWebView.class.isInstance(testView));
assertTrue(CordovaWebViewClient.class.isInstance(testActivity.testViewClient));
[3/3] android commit: CB-3957: The new activity wasn't added to the
Android Manifest
Posted by bo...@apache.org.
CB-3957: The new activity wasn't added to the Android Manifest
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7f5f87ac
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7f5f87ac
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7f5f87ac
Branch: refs/heads/master
Commit: 7f5f87ac72413870ab8a5e990d92b90757b58557
Parents: 0244341
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Jul 15 13:51:27 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Jul 15 13:51:27 2013 -0700
----------------------------------------------------------------------
test/AndroidManifest.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7f5f87ac/test/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 04ef3c6..d329658 100755
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -89,6 +89,16 @@
android:windowSoftInputMode="adjustPan"
android:label="@string/app_name"
android:configChanges="orientation|keyboardHidden"
+ android:name=".actions.backgroundcolor" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.SAMPLE_CODE" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:windowSoftInputMode="adjustPan"
+ android:label="@string/app_name"
+ android:configChanges="orientation|keyboardHidden"
android:name=".actions.basicauth" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
[2/3] android commit: moved the backgroundcolor class to correct
classpath
Posted by bo...@apache.org.
moved the backgroundcolor class to correct classpath
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/0244341a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/0244341a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/0244341a
Branch: refs/heads/master
Commit: 0244341ac58f801cb13b10e200b246579180966b
Parents: ae96d56
Author: ldeluca <ld...@us.ibm.com>
Authored: Thu Jun 27 10:41:30 2013 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Jul 15 13:46:18 2013 -0700
----------------------------------------------------------------------
.../cordova/test/actions/backgroundcolor.java | 40 ++++++++++++++++++++
.../apache/cordova/test/backgroundcolor.java | 40 --------------------
2 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0244341a/test/src/org/apache/cordova/test/actions/backgroundcolor.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/actions/backgroundcolor.java b/test/src/org/apache/cordova/test/actions/backgroundcolor.java
new file mode 100755
index 0000000..d501824
--- /dev/null
+++ b/test/src/org/apache/cordova/test/actions/backgroundcolor.java
@@ -0,0 +1,40 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.cordova.test.actions;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import org.apache.cordova.*;
+
+public class backgroundcolor extends DroidGap {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ // Properties must be set before init() is called, since some are processed during init().
+
+ // backgroundColor can also be set in cordova.xml, but you must use the number equivalent of the color. For example, Color.RED is
+ // <preference name="backgroundColor" value="-65536" />
+ super.setIntegerProperty("backgroundColor", Color.GREEN);
+
+ super.init();
+ super.loadUrl("file:///android_asset/www/backgroundcolor/index.html");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0244341a/test/src/org/apache/cordova/test/backgroundcolor.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/backgroundcolor.java b/test/src/org/apache/cordova/test/backgroundcolor.java
deleted file mode 100755
index f40a673..0000000
--- a/test/src/org/apache/cordova/test/backgroundcolor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.cordova.test;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import org.apache.cordova.*;
-
-public class backgroundcolor extends DroidGap {
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- // Properties must be set before init() is called, since some are processed during init().
-
- // backgroundColor can also be set in cordova.xml, but you must use the number equivalent of the color. For example, Color.RED is
- // <preference name="backgroundColor" value="-65536" />
- super.setIntegerProperty("backgroundColor", Color.GREEN);
-
- super.init();
- super.loadUrl("file:///android_asset/www/backgroundcolor/index.html");
- }
-
-}