[CB-4048] Merge branch '3.0.0' into master
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a97487bc Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a97487bc Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a97487bc Branch: refs/heads/master Commit: a97487bcec2b9bc2e44428dc8b44b151a838391c Parents: 892ffc8 3b7e050 Author: Andrew Grieve <[email protected]> Authored: Fri Jun 28 11:59:54 2013 -0400 Committer: Andrew Grieve <[email protected]> Committed: Fri Jun 28 11:59:54 2013 -0400 ---------------------------------------------------------------------- bin/templates/project/AndroidManifest.xml | 18 +- framework/AndroidManifest.xml | 4 - framework/assets/www/cordova.js | 5357 ++---------------- framework/res/xml/config.xml | 57 - .../src/org/apache/cordova/AccelListener.java | 285 - framework/src/org/apache/cordova/App.java | 221 - .../src/org/apache/cordova/AudioHandler.java | 357 -- .../src/org/apache/cordova/AudioPlayer.java | 553 -- .../src/org/apache/cordova/BatteryListener.java | 163 - .../src/org/apache/cordova/CameraLauncher.java | 807 --- framework/src/org/apache/cordova/Capture.java | 445 -- .../src/org/apache/cordova/CompassListener.java | 295 - .../src/org/apache/cordova/ContactAccessor.java | 198 - .../org/apache/cordova/ContactAccessorSdk5.java | 2174 ------- .../src/org/apache/cordova/ContactManager.java | 122 - .../apache/cordova/CordovaLocationListener.java | 251 - framework/src/org/apache/cordova/Device.java | 199 - .../org/apache/cordova/DirectoryManager.java | 8 +- framework/src/org/apache/cordova/Echo.java | 48 - .../org/apache/cordova/FileProgressResult.java | 63 - .../src/org/apache/cordova/FileTransfer.java | 923 --- .../org/apache/cordova/FileUploadResult.java | 73 - framework/src/org/apache/cordova/FileUtils.java | 1065 ---- .../src/org/apache/cordova/GPSListener.java | 50 - framework/src/org/apache/cordova/GeoBroker.java | 206 - .../src/org/apache/cordova/Globalization.java | 578 -- .../org/apache/cordova/GlobalizationError.java | 108 - .../src/org/apache/cordova/HttpHandler.java | 86 - .../src/org/apache/cordova/InAppBrowser.java | 835 --- .../src/org/apache/cordova/NetworkListener.java | 32 - .../src/org/apache/cordova/NetworkManager.java | 248 - .../src/org/apache/cordova/Notification.java | 448 -- .../src/org/apache/cordova/SplashScreen.java | 43 - framework/src/org/apache/cordova/Storage.java | 244 - 34 files changed, 507 insertions(+), 16057 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a97487bc/framework/assets/www/cordova.js ---------------------------------------------------------------------- diff --cc framework/assets/www/cordova.js index b072c81,33cc366..a7a1b38 --- a/framework/assets/www/cordova.js +++ b/framework/assets/www/cordova.js @@@ -1,5 -1,5 +1,5 @@@ // Platform: android - // 2.9.0rc1-0-g002f33d -// 2.7.0rc1-120-g8731b31 ++// 2.7.0rc1-154-g98a62ff /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@@ -19,7 -19,7 +19,7 @@@ under the License. */ ;(function() { - var CORDOVA_JS_BUILD_LABEL = '2.9.0rc1-0-g002f33d'; -var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-120-g8731b31'; ++var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-154-g98a62ff'; // file: lib/scripts/require.js var require, @@@ -376,7 -376,7 +376,7 @@@ function checkArgs(spec, functionName, if (errMsg) { errMsg += ', but got ' + typeName + '.'; errMsg = 'Wrong type for parameter "' + extractParamName(opt_callee || args.callee, i) + '" of ' + functionName + ': ' + errMsg; -- // Don't log when running jake test. ++ // Don't log when running unit tests. if (typeof jasmine == 'undefined') { console.error(errMsg); } @@@ -6782,6 -2427,6 +2427,8 @@@ window.cordova = require('cordova') // file: lib/scripts/bootstrap-android.js ++// Tell the native code that a page change has occurred. ++require('cordova/exec')(null, null, 'PluginManager', 'startup', []); require('cordova/channel').onNativeReady.fire(); // file: lib/scripts/plugin_loader.js
