You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/06/21 21:37:01 UTC
[6/7] android commit: merge!!!!11one
merge!!!!11one
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/9f66ccb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/9f66ccb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/9f66ccb5
Branch: refs/heads/master
Commit: 9f66ccb5f3f5dc7c2ae3610daf03b22f96173d32
Parents: b339330
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Jun 20 11:10:43 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Jun 21 12:09:50 2012 -0700
----------------------------------------------------------------------
.../src/org/apache/cordova/CameraLauncher.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9f66ccb5/framework/src/org/apache/cordova/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java
index ed0f928..f2c3e12 100755
--- a/framework/src/org/apache/cordova/CameraLauncher.java
+++ b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -81,6 +81,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie
private Uri imageUri; // Uri of captured image
private int encodingType; // Type of encoding to use
private int mediaType; // What type of media to retrieve
+ private boolean saveToPhotoAlbum; // Should the picture be saved to the device's photo album
public String callbackId;
private int numPics;
@@ -121,6 +122,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie
if (action.equals("takePicture")) {
int srcType = CAMERA;
int destType = FILE_URI;
+ this.saveToPhotoAlbum = false;
this.targetHeight = 0;
this.targetWidth = 0;
this.encodingType = JPEG;
@@ -134,6 +136,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie
this.targetHeight = args.getInt(4);
this.encodingType = args.getInt(5);
this.mediaType = args.getInt(6);
+ this.saveToPhotoAlbum = args.getBoolean(9);
if (srcType == CAMERA) {
this.takePicture(destType, encodingType);