Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fbd6b559 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fbd6b559 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fbd6b559 Branch: refs/heads/2.8.x Commit: fbd6b559d45bf3e64e1d84ee8c21d04537bc7c89 Parents: d36b1cc 8900251 Author: Joe Bowser <[email protected]> Authored: Wed May 29 10:46:00 2013 -0400 Committer: Joe Bowser <[email protected]> Committed: Wed May 29 10:46:00 2013 -0400 ---------------------------------------------------------------------- README.md | 20 ++ bin/check_reqs.bat | 19 ++- bin/create | 1 + bin/templates/cordova/build.bat | 18 ++- bin/templates/cordova/clean.bat | 16 ++ bin/templates/cordova/cordova.bat | 4 +- bin/templates/cordova/lib/install-device.bat | 18 ++- bin/templates/cordova/lib/install-emulator.bat | 18 ++- bin/templates/cordova/lib/list-devices.bat | 18 ++- bin/templates/cordova/lib/list-emulator-images.bat | 18 ++- .../cordova/lib/list-started-emulators.bat | 18 ++- bin/templates/cordova/lib/start-emulator.bat | 18 ++- bin/templates/cordova/log.bat | 16 ++ bin/templates/cordova/run.bat | 18 ++- framework/res/xml/config.xml | 29 ++-- framework/src/org/apache/cordova/AudioHandler.java | 16 +-- .../src/org/apache/cordova/CameraLauncher.java | 61 +++---- framework/src/org/apache/cordova/Capture.java | 13 +- framework/src/org/apache/cordova/FileHelper.java | 56 +------ framework/src/org/apache/cordova/FileUtils.java | 121 ++++++++----- .../cordova/IceCreamCordovaWebViewClient.java | 48 +++-- framework/src/org/apache/cordova/JSONUtils.java | 18 ++ .../org/apache/cordova/api/CallbackContext.java | 18 ++ .../src/org/apache/cordova/api/CordovaPlugin.java | 14 -- .../src/org/apache/cordova/api/DataResource.java | 141 --------------- .../apache/cordova/api/DataResourceContext.java | 31 ---- .../src/org/apache/cordova/api/PluginManager.java | 29 --- test/README.md | 20 ++ test/res/xml/config.xml | 18 ++ 29 files changed, 440 insertions(+), 413 deletions(-) ----------------------------------------------------------------------
