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

Merge branch 'pluggable_webview' into 4.0.x

Browse Source
This commit is contained in:
Ian Clelland
2014-05-29 11:20:35 -04:00
parent 635a6279a9 22b1959333
commit b42faea2eb
9 changed files with 199 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/src/org/apache/cordova/AndroidWebView.java
+1 -1
View File
@@ -70,7 +70,7 @@ import android.widget.FrameLayout;
public class AndroidWebView extends WebView implements CordovaWebView {
public static final String TAG = "CordovaWebView";
public static final String CORDOVA_VERSION = "3.5.0-dev";
public static final String CORDOVA_VERSION = "3.6.0-dev";
private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();
framework/src/org/apache/cordova/CordovaWebView.java
+12 -4
View File
@@ -38,9 +38,19 @@ public interface CordovaWebView {
Object getParent();
void loadUrl(String url);
void loadUrl(String url, int splashscreenTime);
void loadUrl(String url);
void loadUrlNow(String url);
void loadUrlIntoView(final String url);
void loadUrlIntoView(final String url, boolean recreatePlugins);
void loadUrlIntoView(final String url, final int splashscreenTime);
void stopLoading();
boolean canGoBack();
@@ -61,7 +71,7 @@ public interface CordovaWebView {
void postMessage(String id, Object data);
void addJavascript(String statement);
void sendJavascript(String statememt);
CordovaChromeClient getWebChromeClient();
@@ -102,8 +112,6 @@ public interface CordovaWebView {
void setOverScrollMode(int overScrollNever);
void loadUrlNow(String string);
void setNetworkAvailable(boolean online);
CordovaResourceApi getResourceApi();