Merge branch 'dev'

This commit is contained in:
Steven Gill 2013-08-19 14:31:12 -07:00
commit e5b70d9446
3 changed files with 8 additions and 9 deletions

View File

@ -2,4 +2,4 @@ cordova-plugin-camera
========================== ==========================
To install this plugin, follow the [Command-line Interface Guide](http://cordova.apache.org/docs/en/edge/guide_cli_index.md.html#The%20Command-line%20Interface). To install this plugin, follow the [Command-line Interface Guide](http://cordova.apache.org/docs/en/edge/guide_cli_index.md.html#The%20Command-line%20Interface).
If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/guide_plugin_ref_plugman.md.html). If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/plugin_ref_plugman.md.html).

View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.camera" id="org.apache.cordova.core.camera"
version="0.1.0"> version="0.2.0">
<name>Camera</name> <name>Camera</name>
<description>Cordova Camera Plugin</description> <description>Cordova Camera Plugin</description>
<license>Apache 2.0</license> <license>Apache 2.0</license>
<keywords>cordova,camera</keywords> <keywords>cordova,camera</keywords>
<js-module src="www/CameraConstants.js" name="Camera"> <js-module src="www/CameraConstants.js" name="Camera">
<clobbers target="Camera" /> <clobbers target="Camera" />
</js-module> </js-module>
@ -28,14 +27,14 @@ xmlns:android="http://schemas.android.com/apk/res/android"
<platform name="android"> <platform name="android">
<config-file target="res/xml/config.xml" parent="/*"> <config-file target="res/xml/config.xml" parent="/*">
<feature name="Camera"> <feature name="Camera">
<param name="android-package" value="org.apache.cordova.core.CameraLauncher"/> <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
</feature> </feature>
</config-file> </config-file>
<config-file target="AndroidManifest.xml" parent="/*"> <config-file target="AndroidManifest.xml" parent="/*">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</config-file> </config-file>
<source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/core" /> <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle"> <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" /> <clobbers target="CameraPopoverHandle" />

View File

@ -16,7 +16,7 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
*/ */
package org.apache.cordova.core; package org.apache.cordova.camera;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;