summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/photoeditor
diff options
context:
space:
mode:
authorYuli Huang <yuli@google.com>2012-05-02 00:50:56 +0800
committerYuli Huang <yuli@google.com>2012-05-02 18:33:29 +0800
commit3db691c36312afb934463f0549a33a7eb58bf696 (patch)
tree2280e3b6d5b48635ac4e0c416f697a45a131b21a /src/com/android/gallery3d/photoeditor
parentc3d5fcfbbb0cd6bd14cc9930fff36356b0024371 (diff)
downloadandroid_packages_apps_Snap-3db691c36312afb934463f0549a33a7eb58bf696.tar.gz
android_packages_apps_Snap-3db691c36312afb934463f0549a33a7eb58bf696.tar.bz2
android_packages_apps_Snap-3db691c36312afb934463f0549a33a7eb58bf696.zip
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
Diffstat (limited to 'src/com/android/gallery3d/photoeditor')
-rw-r--r--src/com/android/gallery3d/photoeditor/PhotoEditor.java2
1 files changed, 2 insertions, 0 deletions
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();
}
}