github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-11 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-1304: Update PhoneGap References to Apache Cordova

Browse Source
This commit is contained in:
Simon MacDonald
2012-09-03 14:10:00 -04:00
parent dc40d8afac
commit 9d0c5349bb
15 changed files with 19 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/.project
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>PhoneGapViewTestActivity</name>
<name>CordovaViewTestActivity</name>
<comment></comment>
<projects>
</projects>
test/res/layout/main.xml
+1 -1
View File
@@ -23,7 +23,7 @@
android:orientation="vertical" >
<org.apache.cordova.CordovaWebView
android:id="@+id/phoneGapView"
android:id="@+id/cordovaWebView"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
test/src/org/apache/cordova/test/ActivityPlugin.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.json.JSONException;
import android.content.Intent;
import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult;
import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
/**
* This class provides a service.
test/src/org/apache/cordova/test/CordovaActivityTest.java
+1 -1
View File
@@ -20,7 +20,7 @@
package org.apache.cordova.test;
import org.apache.cordova.CordovaWebView;
import com.phonegap.api.PluginManager;
import org.apache.cordova.api.PluginManager;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
test/src/org/apache/cordova/test/CordovaTest.java
+3 -3
View File
@@ -19,7 +19,7 @@
package org.apache.cordova.test;
import org.apache.cordova.CordovaWebView;
import com.phonegap.api.PluginManager;
import org.apache.cordova.api.PluginManager;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
@@ -34,13 +34,13 @@ public class CordovaTest extends
private String rString;
public CordovaTest() {
super("com.phonegap.test.activities", CordovaWebViewTestActivity.class);
super("org.apache.cordova.test.activities", CordovaWebViewTestActivity.class);
}
protected void setUp() throws Exception {
super.setUp();
testActivity = this.getActivity();
testView = testActivity.findViewById(R.id.phoneGapView);
testView = testActivity.findViewById(R.id.cordovaWebView);
}
public void testPreconditions() {
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+5 -5
View File
@@ -30,7 +30,7 @@ import android.os.Bundle;
public class CordovaWebViewTestActivity extends Activity implements CordovaInterface {
CordovaWebView phoneGap;
CordovaWebView cordovaWebView;
/** Called when the activity is first created. */
@Override
@@ -39,17 +39,17 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
setContentView(R.layout.main);
phoneGap = (CordovaWebView) findViewById(R.id.phoneGapView);
cordovaWebView = (CordovaWebView) findViewById(R.id.cordovaWebView);
phoneGap.loadUrl("file:///android_asset/www/index.html");
cordovaWebView.loadUrl("file:///android_asset/www/index.html");
}
public void onDestroy()
{
super.onDestroy();
if (phoneGap.pluginManager != null) {
phoneGap.pluginManager.onDestroy();
if (cordovaWebView.pluginManager != null) {
cordovaWebView.pluginManager.onDestroy();
}
}
test/src/org/apache/cordova/test/GapClientTest.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class GapClientTest extends ActivityInstrumentationTestCase2<CordovaWebVi
private CordovaChromeClient appCode;
public GapClientTest() {
super("com.phonegap.test.activities",CordovaWebViewTestActivity.class);
super("org.apache.cordova.test.activities",CordovaWebViewTestActivity.class);
}
protected void setUp() throws Exception{
test/src/org/apache/cordova/test/PluginManagerTest.java
+2 -2
View File
@@ -20,7 +20,7 @@
package org.apache.cordova.test;
import org.apache.cordova.CordovaWebView;
import com.phonegap.api.PluginManager;
import org.apache.cordova.api.PluginManager;
import android.test.ActivityInstrumentationTestCase2;
import android.view.View;
@@ -37,7 +37,7 @@ public class PluginManagerTest extends ActivityInstrumentationTestCase2<CordovaW
private PluginManager pMan;
public PluginManagerTest() {
super("com.phonegap.test.activities",CordovaWebViewTestActivity.class);
super("org.apache.cordova.test.activities",CordovaWebViewTestActivity.class);
}
protected void setUp() throws Exception{