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 | 3a1279f11ec88e62a75303469b886f1cb9d50c30 (patch) | |
| tree | 70055ae1a78140327debd14fa39d680173091e76 /src | |
| parent | 895e13e85dcb156cdc4eff882e10c4497a56de1e (diff) | |
| parent | 7a84c578a4b3bea9eebb0b21ac161c18aad49346 (diff) | |
| download | android_packages_apps_Gallery2-3a1279f11ec88e62a75303469b886f1cb9d50c30.tar.gz android_packages_apps_Gallery2-3a1279f11ec88e62a75303469b886f1cb9d50c30.tar.bz2 android_packages_apps_Gallery2-3a1279f11ec88e62a75303469b886f1cb9d50c30.zip | |
Merge "Start Camera album in grid mode" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -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; |