From e0dcf33665378829a4a0d437ef06429d95f6e211 Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Wed, 27 Jun 2012 13:40:06 +0800 Subject: Show undo option for 3 seconds after the last picture is deleted. Bug: 6742326 Change-Id: I5008c1984fff0a2affaeabf2a195cfcdc517ebc2 --- src/com/android/gallery3d/app/PhotoPage.java | 7 ++++++- src/com/android/gallery3d/data/FilterDeleteSet.java | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 568f5901f..17f57c204 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -253,7 +253,12 @@ public class PhotoPage extends ActivityState implements MediaItem photo = mModel.getMediaItem(0); if (photo != null) updateCurrentPhoto(photo); } else if (mIsActive) { - mActivity.getStateManager().finishState(PhotoPage.this); + // We only want to finish the PhotoPage if there is no + // deletion that the user can undo. + if (mMediaSet.getNumberOfDeletions() == 0) { + mActivity.getStateManager().finishState( + PhotoPage.this); + } } } diff --git a/src/com/android/gallery3d/data/FilterDeleteSet.java b/src/com/android/gallery3d/data/FilterDeleteSet.java index 97bbc1256..dbd85d57d 100644 --- a/src/com/android/gallery3d/data/FilterDeleteSet.java +++ b/src/com/android/gallery3d/data/FilterDeleteSet.java @@ -25,6 +25,7 @@ import java.util.ArrayList; // void addDeletion(Path path, int index); // void removeDelection(Path path); // void clearDeletion(); +// int getNumberOfDeletions(); // public class FilterDeleteSet extends MediaSet implements ContentListener { private static final String TAG = "FilterDeleteSet"; @@ -242,4 +243,10 @@ public class FilterDeleteSet extends MediaSet implements ContentListener { public void clearDeletion() { sendRequest(REQUEST_CLEAR, null /* unused */ , 0 /* unused */); } + + // Returns number of deletions _in effect_ (the number will only gets + // updated after a reload()). + public int getNumberOfDeletions() { + return mCurrent.size(); + } } -- cgit v1.2.3