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 2013/05/10 23:03:34 UTC
[09/13] android commit: Merging 3.0 with latest master
Merging 3.0 with latest 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/3e01b436
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/3e01b436
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/3e01b436
Branch: refs/heads/3.0.0
Commit: 3e01b43662d03e09803eeaf00b970775e2576b8c
Parents: 21614ea 7fb8ab2
Author: Joe Bowser <bo...@apache.org>
Authored: Fri May 3 11:27:13 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 3 11:27:13 2013 -0700
----------------------------------------------------------------------
bin/templates/project/assets/www/index.html | 2 +-
framework/AndroidManifest.xml | 9 +-
framework/assets/js/cordova.android.js | 247 +--
framework/assets/www/index.html | 2 +-
framework/res/xml/config.xml | 58 -
.../src/org/apache/cordova/AccelListener.java | 285 --
framework/src/org/apache/cordova/App.java | 221 --
framework/src/org/apache/cordova/AudioHandler.java | 357 ---
framework/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 -
.../src/org/apache/cordova/CordovaActivity.java | 1155 ++++++++
.../apache/cordova/CordovaLocationListener.java | 251 --
.../src/org/apache/cordova/CordovaWebView.java | 2 +
.../org/apache/cordova/CordovaWebViewClient.java | 1 +
framework/src/org/apache/cordova/Device.java | 199 --
.../src/org/apache/cordova/DirectoryManager.java | 8 +-
framework/src/org/apache/cordova/DroidGap.java | 1161 +--------
framework/src/org/apache/cordova/Echo.java | 48 -
framework/src/org/apache/cordova/ExifHelper.java | 185 --
framework/src/org/apache/cordova/ExposedJsApi.java | 1 +
.../src/org/apache/cordova/FileProgressResult.java | 63 -
framework/src/org/apache/cordova/FileTransfer.java | 964 -------
.../src/org/apache/cordova/FileUploadResult.java | 73 -
framework/src/org/apache/cordova/FileUtils.java | 1059 -------
framework/src/org/apache/cordova/GPSListener.java | 50 -
framework/src/org/apache/cordova/GeoBroker.java | 206 --
.../src/org/apache/cordova/Globalization.java | 577 ----
.../src/org/apache/cordova/GlobalizationError.java | 108 -
framework/src/org/apache/cordova/HttpHandler.java | 86 -
framework/src/org/apache/cordova/InAppBrowser.java | 813 ------
.../cordova/LinearLayoutSoftKeyboardDetect.java | 5 +-
.../org/apache/cordova/NativeToJsMessageQueue.java | 1 +
.../src/org/apache/cordova/NetworkListener.java | 32 -
.../src/org/apache/cordova/NetworkManager.java | 248 --
framework/src/org/apache/cordova/Notification.java | 448 ---
framework/src/org/apache/cordova/SplashScreen.java | 43 -
framework/src/org/apache/cordova/Storage.java | 244 --
framework/src/org/apache/cordova/core/Device.java | 201 ++
44 files changed, 1411 insertions(+), 12759 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/3e01b436/framework/res/xml/config.xml
----------------------------------------------------------------------
diff --cc framework/res/xml/config.xml
index 2fb16c4,41c07e5..e1fb3ac
--- a/framework/res/xml/config.xml
+++ b/framework/res/xml/config.xml
@@@ -32,70 -32,11 +32,12 @@@
<!-- <content src="http://mysite.com/myapp.html" /> for external pages -->
<content src="index.html" />
- <log level="DEBUG"/>
- <preference name="useBrowserHistory" value="true" />
- <preference name="exit-on-suspend" value="false" />
-<plugins>
- <plugin name="Device" value="org.apache.cordova.core.Device"/>
-</plugins>
-</cordova>
-
+ <preference name="loglevel" value="DEBUG" />
+ <!--
+ <preference name="splashscreen" value="resourceName" />
+ <preference name="backgroundColor" value="0xFFF" />
+ <preference name="loadUrlTimeoutValue" value="20000" />
+ <preference name="InAppBrowserStorageEnabled" value="true" />
+ <preference name="disallowOverscroll" value="true" />
+ -->
-
- <feature name="App">
- <param name="android-package" value="org.apache.cordova.App"/>
- </feature>
- <feature name="Geolocation">
- <param name="android-package" value="org.apache.cordova.GeoBroker"/>
- </feature>
- <feature name="Device">
- <param name="android-package" value="org.apache.cordova.Device"/>
- </feature>
- <feature name="Accelerometer">
- <param name="android-package" value="org.apache.cordova.AccelListener"/>
- </feature>
- <feature name="Compass">
- <param name="android-package" value="org.apache.cordova.CompassListener"/>
- </feature>
- <feature name="Media">
- <param name="android-package" value="org.apache.cordova.AudioHandler"/>
- </feature>
- <feature name="Camera">
- <param name="android-package" value="org.apache.cordova.CameraLauncher"/>
- </feature>
- <feature name="Contacts">
- <param name="android-package" value="org.apache.cordova.ContactManager"/>
- </feature>
- <feature name="File">
- <param name="android-package" value="org.apache.cordova.FileUtils"/>
- </feature>
- <feature name="NetworkStatus">
- <param name="android-package" value="org.apache.cordova.NetworkManager"/>
- </feature>
- <feature name="Notification">
- <param name="android-package" value="org.apache.cordova.Notification"/>
- </feature>
- <feature name="Storage">
- <param name="android-package" value="org.apache.cordova.Storage"/>
- </feature>
- <feature name="FileTransfer">
- <param name="android-package" value="org.apache.cordova.FileTransfer"/>
- </feature>
- <feature name="Capture">
- <param name="android-package" value="org.apache.cordova.Capture"/>
- </feature>
- <feature name="Battery">
- <param name="android-package" value="org.apache.cordova.BatteryListener"/>
- </feature>
- <feature name="SplashScreen">
- <param name="android-package" value="org.apache.cordova.SplashScreen"/>
- </feature>
- <feature name="Echo">
- <param name="android-package" value="org.apache.cordova.Echo"/>
- </feature>
- <feature name="Globalization">
- <param name="android-package" value="org.apache.cordova.Globalization"/>
- </feature>
- <feature name="InAppBrowser">
- <param name="android-package" value="org.apache.cordova.InAppBrowser"/>
- </feature>
+</widget>