github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2024-10-06 17:42:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView

Browse Source
This commit is contained in:
Joe Bowser 2012-04-23 14:30:22 -07:00
commit be39bf8d91
5 changed files with 188 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.6.1
1.7.0rc1

2
bin/templates/project/cordova/templates/project/assets/www/index.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>PhoneGap</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
<script type="text/javascript" charset="utf-8" src="cordova-1.6.1.js"></script>
<script type="text/javascript" charset="utf-8" src="cordova-1.7.0rc1.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>
</head>

416
framework/assets/js/cordova.android.js
View File

File diff suppressed because it is too large Load Diff

2
framework/assets/www/index.html
View File

@ -19,7 +19,7 @@
<html>
<head>
<title></title>
<script src="cordova-1.6.1.js"></script>
<script src="cordova-1.7.0rc1.js"></script>
</head>
<body>

2
framework/src/org/apache/cordova/Device.java
View File

@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends Plugin {
public static final String TAG = "Device";
public static String cordovaVersion = "1.6.1"; // Cordova version
public static String cordovaVersion = "1.7.0rc1"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID