From 3db691c36312afb934463f0549a33a7eb58bf696 Mon Sep 17 00:00:00 2001
From: Yuli Huang <yuli@google.com>
Date: Wed, 2 May 2012 00:50:56 +0800
Subject: Fix 'Edit' and 'Crop' behaviors.

1. Make Gallery show edited local photo after resuming, similar to how
it shows cropped local photo after resuming.
2. Fix inconsistency between cropping local/PWA photo.

bug:6168430
Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
---
 src/com/android/gallery3d/photoeditor/PhotoEditor.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/com/android/gallery3d/photoeditor')

diff --git a/src/com/android/gallery3d/photoeditor/PhotoEditor.java b/src/com/android/gallery3d/photoeditor/PhotoEditor.java
index 19e49c4a1..4359cf6ed 100644
--- a/src/com/android/gallery3d/photoeditor/PhotoEditor.java
+++ b/src/com/android/gallery3d/photoeditor/PhotoEditor.java
@@ -195,10 +195,12 @@ public class PhotoEditor extends Activity {
 
                             @Override
                             public void run() {
+                                // Discard unsaved photo for the result.
                                 finish();
                             }
                         }, R.string.save_photo).show();
                     } else {
+                        setResult(RESULT_OK, new Intent().setData(saveUri));
                         finish();
                     }
                 }
-- 
cgit v1.2.3