summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2012-10-04 19:33:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-04 19:33:37 -0700
commit4303e30017d4a90ee095347106053beaa88895c0 (patch)
tree0dfc7519bf517ee292d0d34d8ed3e1f34b6ce992
parent7f905f7a79968a713c4da7c80646d92a9b87dcc6 (diff)
parenta70201c33d3a8796ac30fd8ec86e2bec41f9820a (diff)
downloadandroid_packages_apps_Snap-4303e30017d4a90ee095347106053beaa88895c0.tar.gz
android_packages_apps_Snap-4303e30017d4a90ee095347106053beaa88895c0.tar.bz2
android_packages_apps_Snap-4303e30017d4a90ee095347106053beaa88895c0.zip
Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/app/AlbumSetPage.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 7af1d445e..c8c351496 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -37,6 +37,7 @@ import com.android.gallery3d.R;
import com.android.gallery3d.common.Utils;
import com.android.gallery3d.data.DataManager;
import com.android.gallery3d.data.MediaDetails;
+import com.android.gallery3d.data.MediaItem;
import com.android.gallery3d.data.MediaObject;
import com.android.gallery3d.data.MediaSet;
import com.android.gallery3d.data.Path;
@@ -60,6 +61,7 @@ import com.android.gallery3d.util.GalleryUtils;
import com.android.gallery3d.util.HelpUtils;
import java.lang.ref.WeakReference;
+import java.util.ArrayList;
public class AlbumSetPage extends ActivityState implements
SelectionManager.SelectionListener, GalleryActionBar.ClusterRunner,
@@ -211,7 +213,10 @@ public class AlbumSetPage extends ActivityState implements
private static boolean albumShouldOpenInFilmstrip(MediaSet album) {
int itemCount = album.getMediaItemCount();
- return (album.isCameraRoll() && itemCount > 0) || itemCount == 1;
+ ArrayList<MediaItem> list = (itemCount == 1) ? album.getMediaItem(0, 1) : null;
+ return (album.isCameraRoll() && itemCount > 0)
+ // open in film strip only if there's one item in the album and the item exists
+ || (list != null && !list.isEmpty());
}
WeakReference<Toast> mEmptyAlbumToast = null;