diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2012-10-04 19:33:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 19:33:37 -0700 |
| commit | 9bcba5b049f199ad78051c2ad27897cad389679d (patch) | |
| tree | d979e9f2425cbb373ea296678d6b08eb07d24501 | |
| parent | f47e790e3f3553f69abe054eec20bd7585118843 (diff) | |
| parent | 27565de3ab86e81a20c9804ebc7f8d3f737031a0 (diff) | |
| download | android_packages_apps_Gallery2-9bcba5b049f199ad78051c2ad27897cad389679d.tar.gz android_packages_apps_Gallery2-9bcba5b049f199ad78051c2ad27897cad389679d.tar.bz2 android_packages_apps_Gallery2-9bcba5b049f199ad78051c2ad27897cad389679d.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.java | 7 |
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; |