Fix 5188970 Cannot close Gallery when opened from Email/Gmail

Change-Id: I7af203a9aec8ebaf6c33fa592c996f917e0caca8

diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 5c09ce2..1b6145f 100644 (file)
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -458,6 +458,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
     @Override
     protected boolean onItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.action_cancel:
+                mActivity.getStateManager().finishState(this);
+                return true;
             case R.id.action_select:
                 mSelectionManager.setAutoLeaveSelectionMode(false);
                 mSelectionManager.enterSelectionMode();

diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 688ff81..73500c8 100644 (file)
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -408,6 +408,10 @@ public class AlbumSetPage extends ActivityState implements
     protected boolean onItemSelected(MenuItem item) {
         Activity activity = (Activity) mActivity;
         switch (item.getItemId()) {
+            case R.id.action_cancel:
+                activity.setResult(Activity.RESULT_CANCELED);
+                activity.finish();
+                return true;
             case R.id.action_select:
                 mSelectionManager.setAutoLeaveSelectionMode(false);
                 mSelectionManager.enterSelectionMode();