Save edited picasa to "Edited Online Photos" album

Bug: 7346157

This CL includes the following changes:
1) Save the new image to a new folder named "Edited Online Photos"
2) After the picture is saved, the user will be in the "Edited Online Photos" folder
3) Change the toast during saving to "Saving to" + new folder name

Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d

1 files changed, 10 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 90b82cefc..ecb48329a 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1180,6 +1180,16 @@ public class PhotoPage extends ActivityState implements
         Path path = mApplication.getDataManager()
                 .findPathByUri(intent.getData(), intent.getType());
         if (path != null) {
+            Path albumPath = mApplication.getDataManager().getDefaultSetOf(path);
+            if (!albumPath.equalsIgnoreCase(mOriginalSetPathString)) {
+                // If the edited image is stored in a different album, we need
+                // to start a new activity state to show the new image
+                Bundle data = new Bundle(getData());
+                data.putString(KEY_MEDIA_SET_PATH, albumPath.toString());
+                data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, path.toString());
+                mActivity.getStateManager().startState(PhotoPage.class, data);
+                return;
+            }
             mModel.setCurrentPhoto(path, mCurrentIndex);
         }
     }