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 2012/06/11 19:29:05 UTC
[8/10] android commit: Merge remote-tracking branch 'upstream/master'
into volumebtns
Merge remote-tracking branch 'upstream/master' into volumebtns
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/3b27d89c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/3b27d89c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/3b27d89c
Branch: refs/heads/master
Commit: 3b27d89c4a924c84248a904e7dc19f1fef8e0091
Parents: 8356ac6 fae0c3d
Author: Julien Bouquillon <ju...@bouquillon.com>
Authored: Wed May 23 23:43:55 2012 +0200
Committer: Julien Bouquillon <ju...@bouquillon.com>
Committed: Wed May 23 23:43:55 2012 +0200
----------------------------------------------------------------------
bin/create | 5 +
bin/create.bat | 2 +-
bin/create.js | 111 ++++-
bin/templates/project/cordova/create.bat | 2 +
bin/templates/project/cordova/create.js | 69 +++
.../cordova/templates/project/assets/www/main.js | 2 +-
.../templates/project/res/drawable-hdpi/icon.png | Bin 0 -> 6080 bytes
.../templates/project/res/drawable-ldpi/icon.png | Bin 0 -> 3096 bytes
.../templates/project/res/drawable-mdpi/icon.png | Bin 0 -> 4090 bytes
.../templates/project/res/drawable-xhdpi/icon.png | Bin 0 -> 7685 bytes
.../templates/project/res/drawable/icon.png | Bin 5800 -> 7685 bytes
framework/.settings/org.eclipse.jdt.core.prefs | 4 -
framework/assets/js/cordova.android.js | 197 ++++++---
framework/project.properties | 2 +-
.../src/org/apache/cordova/AccelListener.java | 352 +++++++--------
framework/src/org/apache/cordova/DroidGap.java | 4 +-
framework/src/org/apache/cordova/FileUtils.java | 2 +-
17 files changed, 462 insertions(+), 290 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/3b27d89c/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------