Merge "Start Camera album in grid mode" into gb-ub-photos-arches
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;