commit 3a1279f11ec88e62a75303469b886f1cb9d50c30
author Bobby Georgescu <georgescu@google.com> Mon Oct 08 19:32:55 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 08 19:32:56 2012 -0700
tree 70055ae1a78140327debd14fa39d680173091e76
parent 895e13e85dcb156cdc4eff882e10c4497a56de1e
parent 7a84c578a4b3bea9eebb0b21ac161c18aad49346

Merge "Start Camera album in grid mode" into gb-ub-photos-arches

src/com/android/gallery3d/app/AlbumSetPage.java

diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index c8c3514..eaf9145 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -214,9 +214,8 @@
     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;