diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-08 19:34:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-08 19:34:22 -0700 |
| commit | 56eaf6ddce08bb2819d582c1dc5e81934291099f (patch) | |
| tree | 0b0bdd78f32c3edec473575c9955defc81ab1450 | |
| parent | 7ae9cec4a10f7aaaa369a651e4af79ef1d59b90b (diff) | |
| parent | 0f9ebfc80f2db3bcb0ecee9b77418d7d81c5956e (diff) | |
| download | android_packages_apps_Snap-56eaf6ddce08bb2819d582c1dc5e81934291099f.tar.gz android_packages_apps_Snap-56eaf6ddce08bb2819d582c1dc5e81934291099f.tar.bz2 android_packages_apps_Snap-56eaf6ddce08bb2819d582c1dc5e81934291099f.zip | |
am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches
* commit '3a1279f11ec88e62a75303469b886f1cb9d50c30':
Start Camera album in grid mode
| -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; |