1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index a9aa8e729..8c2319547 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -42,6 +42,7 @@ import com.android.gallery3d.R;
 import com.android.gallery3d.anim.FloatAnimation;
 import com.android.gallery3d.common.ApiHelper;
 import com.android.gallery3d.common.Utils;
+import com.android.gallery3d.data.ComboAlbum;
 import com.android.gallery3d.data.DataManager;
 import com.android.gallery3d.data.FilterDeleteSet;
 import com.android.gallery3d.data.MediaDetails;
@@ -369,6 +370,11 @@ public class PhotoPage extends ActivityState implements
 
             MediaSet originalSet = mActivity.getDataManager()
                     .getMediaSet(mSetPathString);
+            if (originalSet instanceof ComboAlbum) {
+                // Use the name of the camera album rather than the default
+                // ComboAlbum behavior
+                ((ComboAlbum) originalSet).useNameOfChild(1);
+            }
             mSelectionManager.setSourceMediaSet(originalSet);
             mSetPathString = "/filter/delete/{" + mSetPathString + "}";
             mMediaSet = (FilterDeleteSet) mActivity.getDataManager()