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/01/11 19:25:01 UTC
[4/10] android commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-android into CordovaActivity
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android into CordovaActivity
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6db9a7cb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6db9a7cb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6db9a7cb
Branch: refs/heads/master
Commit: 6db9a7cb123adac7ad5239dbced5be9cee19a2ea
Parents: c8ec7e5 1f39386
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Jan 10 16:26:24 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Jan 10 16:26:24 2013 -0800
----------------------------------------------------------------------
README.md | 4 +-
VERSION | 2 +-
bin/create | 2 +-
bin/templates/project/assets/www/index.html | 2 +-
framework/assets/js/cordova.android.js | 61 ++-
framework/assets/www/index.html | 2 +-
framework/src/org/apache/cordova/App.java | 10 +-
.../src/org/apache/cordova/CameraLauncher.java | 3 +-
.../org/apache/cordova/ContactAccessorSdk5.java | 3 +-
.../org/apache/cordova/CordovaChromeClient.java | 9 +-
framework/src/org/apache/cordova/Device.java | 4 +-
framework/src/org/apache/cordova/DroidGap.java | 15 +-
framework/src/org/apache/cordova/FileTransfer.java | 3 +-
framework/src/org/apache/cordova/FileUtils.java | 69 ++-
framework/src/org/apache/cordova/InAppBrowser.java | 95 ++-
.../org/apache/cordova/api/CordovaInterface.java | 5 -
.../src/org/apache/cordova/api/LegacyContext.java | 3 +-
test/assets/www/cordova.android.js | 655 +++++++--------
18 files changed, 490 insertions(+), 457 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6db9a7cb/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------