diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-08 19:32:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-08 19:32:56 -0700 |
| commit | 0f9ebfc80f2db3bcb0ecee9b77418d7d81c5956e (patch) | |
| tree | 00c51cee3116c6549df10fbf9f4afc701124fc98 | |
| parent | feaca8e412e0db58fbcc74f680d8a72e9b29f6d6 (diff) | |
| parent | 76cf1a48c4d6c55da052ee5ec006241ffe77ffa6 (diff) | |
| download | android_packages_apps_Snap-0f9ebfc80f2db3bcb0ecee9b77418d7d81c5956e.tar.gz android_packages_apps_Snap-0f9ebfc80f2db3bcb0ecee9b77418d7d81c5956e.tar.bz2 android_packages_apps_Snap-0f9ebfc80f2db3bcb0ecee9b77418d7d81c5956e.zip | |
Merge "Start Camera album in grid mode" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index c8c351496..eaf91451a 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -214,9 +214,8 @@ public class AlbumSetPage extends ActivityState implements private static boolean albumShouldOpenInFilmstrip(MediaSet album) { int itemCount = album.getMediaItemCount(); 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()); + // open in film strip only if there's one item in the album and the item exists + return (list != null && !list.isEmpty()); } WeakReference<Toast> mEmptyAlbumToast = null; |