Fix saving

Use the preview image to provide
a faster result in Gallery

Change-Id: Icfcdc2f423bf2e21428d9f7a5116a2b4c02eb79b

2 files changed, 11 insertions, 5 deletions

diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java b/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java
index c29376f6e..5c416bccc 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java
@@ -37,6 +37,7 @@ public class ImageSavingTask extends ProcessingTask {
         boolean flatten;
         int quality;
         float sizeFactor;
+        Bitmap previewImage;
     }
 
     static class UpdateBitmap implements Update {
@@ -57,7 +58,8 @@ public class ImageSavingTask extends ProcessingTask {
     }
 
     public void saveImage(Uri sourceUri, Uri selectedUri,
-                          File destinationFile, ImagePreset preset, boolean flatten,
+                          File destinationFile, ImagePreset preset,
+                          Bitmap previewImage, boolean flatten,
                           int quality, float sizeFactor) {
         SaveRequest request = new SaveRequest();
         request.sourceUri = sourceUri;
@@ -67,6 +69,7 @@ public class ImageSavingTask extends ProcessingTask {
         request.flatten = flatten;
         request.quality = quality;
         request.sizeFactor = sizeFactor;
+        request.previewImage = previewImage;
         postRequest(request);
     }
 
@@ -75,6 +78,7 @@ public class ImageSavingTask extends ProcessingTask {
         Uri sourceUri = request.sourceUri;
         Uri selectedUri = request.selectedUri;
         File destinationFile = request.destinationFile;
+        Bitmap previewImage = request.previewImage;
         ImagePreset preset = request.preset;
         boolean flatten = request.flatten;
         // We create a small bitmap showing the result that we can
@@ -83,7 +87,7 @@ public class ImageSavingTask extends ProcessingTask {
         updateBitmap.bitmap = createNotificationBitmap(sourceUri, preset);
         postUpdate(updateBitmap);
         SaveImage saveImage = new SaveImage(mProcessingService, sourceUri,
-                selectedUri, destinationFile,
+                selectedUri, destinationFile, previewImage,
                 new SaveImage.Callback() {
                     @Override
                     public void onProgress(int max, int current) {
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
index 518f232f9..7d3767ae4 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
@@ -32,6 +32,7 @@ import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.filters.FiltersManager;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
+import com.android.gallery3d.filtershow.imageshow.MasterImage;
 import com.android.gallery3d.filtershow.tools.SaveImage;
 
 import java.io.File;
@@ -209,6 +210,7 @@ public class ProcessingService extends Service {
             mNeedsAlive = false;
             mSaving = true;
             handleSaveRequest(sourceUri, selectedUri, destinationFile, preset,
+                    MasterImage.getImage().getHighresImage(),
                     flatten, quality, sizeFactor);
         }
         return START_REDELIVER_INTENT;
@@ -227,8 +229,8 @@ public class ProcessingService extends Service {
     }
 
     public void handleSaveRequest(Uri sourceUri, Uri selectedUri,
-            File destinationFile, ImagePreset preset, boolean flatten,
-            int quality, float sizeFactor) {
+            File destinationFile, ImagePreset preset, Bitmap previewImage,
+            boolean flatten, int quality, float sizeFactor) {
         mNotifyMgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 
         mNotificationId++;
@@ -246,7 +248,7 @@ public class ProcessingService extends Service {
         // Process the image
 
         mImageSavingTask.saveImage(sourceUri, selectedUri, destinationFile,
-                preset, flatten, quality, sizeFactor);
+                preset, previewImage, flatten, quality, sizeFactor);
     }
 
     public void updateNotificationWithBitmap(Bitmap bitmap) {