incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [3/3] android commit: merge!!!!11one
Date Wed, 20 Jun 2012 21:37:20 GMT
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/b49d8225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/b49d8225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/b49d8225

Branch: refs/heads/mediascanner
Commit: b49d8225d1ff19de638f97df7b1a72d7b1fb8b5a
Parents: de9640b
Author: Fil Maj <maj.fil@gmail.com>
Authored: Wed Jun 20 11:10:43 2012 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Wed Jun 20 11:10:43 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/b49d8225/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 b2ab74f..1845358 100755
--- a/framework/src/org/apache/cordova/CameraLauncher.java
+++ b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -78,6 +78,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;
@@ -118,6 +119,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;
@@ -131,6 +133,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);


Mime
View raw message