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

Merge branch 'master' into pluggable_webview

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java
This commit is contained in:
Ian Clelland
2014-05-15 15:59:11 -04:00
parent 1a17083e8c 50c4aef873
commit 97008305ff
8 changed files with 163 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/org/apache/cordova/AndroidWebView.java
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>();