Updated Branches: refs/heads/master bf0df9f3c -> 576f8cba4
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android 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/576f8cba Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/576f8cba Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/576f8cba Branch: refs/heads/master Commit: 576f8cba44343cb000562c8b02f5c2cdd1163230 Parents: b9f9429 bf0df9f Author: Anis Kadri <[email protected]> Authored: Thu Jun 21 21:15:59 2012 -0700 Committer: Anis Kadri <[email protected]> Committed: Thu Jun 21 21:15:59 2012 -0700 ---------------------------------------------------------------------- framework/assets/js/cordova.android.js | 83 ++++------ framework/src/org/apache/cordova/App.java | 4 +- .../src/org/apache/cordova/CameraLauncher.java | 128 ++++++++++----- .../src/org/apache/cordova/CordovaWebView.java | 111 +++++++++++++ .../org/apache/cordova/CordovaWebViewClient.java | 47 ++++++ framework/src/org/apache/cordova/DroidGap.java | 82 +--------- .../org/apache/cordova/api/CordovaInterface.java | 14 -- 7 files changed, 287 insertions(+), 182 deletions(-) ----------------------------------------------------------------------
