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/d87f404d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/d87f404d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/d87f404d Branch: refs/heads/master Commit: d87f404d6ebf13b294b218c22d2acbb3574350c6 Parents: 48c6ec8 80a5ea1 Author: macdonst <[email protected]> Authored: Fri Jun 8 13:03:44 2012 -0400 Committer: macdonst <[email protected]> Committed: Fri Jun 8 13:03:44 2012 -0400 ---------------------------------------------------------------------- NOTICE | 4 +- README.md | 7 + framework/assets/js/cordova.android.js | 2 +- framework/res/xml/cordova.xml | 2 +- framework/src/com/phonegap/api/PluginManager.java | 5 +- .../src/org/apache/cordova/AccelListener.java | 58 +- framework/src/org/apache/cordova/App.java | 31 +- framework/src/org/apache/cordova/AudioHandler.java | 33 +- framework/src/org/apache/cordova/AudioPlayer.java | 133 +- .../src/org/apache/cordova/BatteryListener.java | 7 +- .../src/org/apache/cordova/CallbackServer.java | 176 +- .../src/org/apache/cordova/CameraLauncher.java | 117 +- framework/src/org/apache/cordova/Capture.java | 44 +- .../src/org/apache/cordova/CompassListener.java | 5 +- .../src/org/apache/cordova/ContactAccessor.java | 13 +- .../org/apache/cordova/ContactAccessorSdk5.java | 2982 +++++----- .../src/org/apache/cordova/ContactManager.java | 2 +- .../org/apache/cordova/CordovaChromeClient.java | 165 +- .../src/org/apache/cordova/CordovaWebView.java | 663 ++ .../org/apache/cordova/CordovaWebViewClient.java | 253 +- framework/src/org/apache/cordova/Device.java | 23 +- .../src/org/apache/cordova/DirectoryManager.java | 14 +- framework/src/org/apache/cordova/DroidGap.java | 947 +-- framework/src/org/apache/cordova/FileTransfer.java | 39 +- framework/src/org/apache/cordova/FileUtils.java | 58 +- framework/src/org/apache/cordova/GeoBroker.java | 73 +- framework/src/org/apache/cordova/HttpHandler.java | 24 +- .../cordova/LinearLayoutSoftKeyboardDetect.java | 14 +- .../src/org/apache/cordova/NetworkManager.java | 17 +- framework/src/org/apache/cordova/Notification.java | 574 +- .../src/org/apache/cordova/PreferenceNode.java | 34 - .../src/org/apache/cordova/PreferenceSet.java | 62 - framework/src/org/apache/cordova/SplashScreen.java | 3 +- framework/src/org/apache/cordova/Storage.java | 2 +- framework/src/org/apache/cordova/TempListener.java | 8 +- .../org/apache/cordova/api/CordovaInterface.java | 124 +- framework/src/org/apache/cordova/api/IPlugin.java | 15 +- framework/src/org/apache/cordova/api/Plugin.java | 37 +- .../src/org/apache/cordova/api/PluginEntry.java | 13 +- .../src/org/apache/cordova/api/PluginManager.java | 42 +- .../src/org/apache/cordova/api/PluginResult.java | 19 +- guides/Cordova Upgrade Guide.md | 29 + guides/CordovaWebView Guide.md | 53 + test/.project | 2 +- test/AndroidManifest.xml | 94 +- test/README.md | 27 +- test/assets/www/backgroundcolor/index.html | 41 + test/assets/www/basicauth/index.html | 42 + test/assets/www/cordova-1.6.0.js | 4985 --------------- test/assets/www/fullscreen/index.html | 42 + test/assets/www/index.html | 35 +- test/proguard.cfg | 40 + test/project.properties | 2 +- test/res/layout/main.xml | 16 +- test/res/values/strings.xml | 2 +- test/res/xml/cordova.xml | 16 +- .../org/apache/cordova/test/ActivityPlugin.java | 4 +- .../org/apache/cordova/test/CordovaActivity.java | 33 + .../apache/cordova/test/CordovaActivityTest.java | 68 + test/src/org/apache/cordova/test/CordovaTest.java | 109 + .../cordova/test/CordovaWebViewTestActivity.java | 96 + test/src/org/apache/cordova/test/ErrorUrlTest.java | 54 + .../src/org/apache/cordova/test/GapClientTest.java | 67 + .../org/apache/cordova/test/HtmlNotFoundTest.java | 52 + test/src/org/apache/cordova/test/IFrameTest.java | 11 + test/src/org/apache/cordova/test/JQMTabTest.java | 12 + .../src/org/apache/cordova/test/LifecycleTest.java | 11 + .../org/apache/cordova/test/LoadTimeoutTest.java | 50 + .../org/apache/cordova/test/PluginManagerTest.java | 69 + .../org/apache/cordova/test/SplashscreenTest.java | 27 + .../org/apache/cordova/test/UserWebViewTest.java | 11 + .../src/org/apache/cordova/test/WhitelistTest.java | 12 + test/src/org/apache/cordova/test/XhrTest.java | 11 + test/src/org/apache/cordova/test/background.java | 1 - .../org/apache/cordova/test/backgroundcolor.java | 40 + test/src/org/apache/cordova/test/basicauth.java | 43 + test/src/org/apache/cordova/test/errorurl.java | 2 + test/src/org/apache/cordova/test/fullscreen.java | 39 + test/src/org/apache/cordova/test/tests.java | 2 +- test/src/org/apache/cordova/test/userwebview.java | 2 +- test/src/org/apache/cordova/test/whitelist.java | 2 +- 81 files changed, 4792 insertions(+), 8306 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d87f404d/framework/src/org/apache/cordova/DroidGap.java ----------------------------------------------------------------------
