diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-09-12 16:37:53 -0700 |
|---|---|---|
| committer | Bobby Georgescu <georgescu@google.com> | 2012-09-12 16:44:41 -0700 |
| commit | b265ebb01cc046b74329eeb28dbecb24e0f953d2 (patch) | |
| tree | b19269816088f019ad981bb2668d93a3b27fb59b | |
| parent | 9b3c279ce002fbf9305966461e465e8e611de446 (diff) | |
| download | android_packages_apps_Gallery2-b265ebb01cc046b74329eeb28dbecb24e0f953d2.tar.gz android_packages_apps_Gallery2-b265ebb01cc046b74329eeb28dbecb24e0f953d2.tar.bz2 android_packages_apps_Gallery2-b265ebb01cc046b74329eeb28dbecb24e0f953d2.zip | |
When tapping single-photo albums, launch photo directly
Bug: 7145102
Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index c61890c06..ed632ac30 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -202,7 +202,8 @@ public class AlbumSetPage extends ActivityState implements } private static boolean albumShouldOpenInFilmstrip(MediaSet album) { - return album.isCameraRoll() && album.getMediaItemCount() > 0; + int itemCount = album.getMediaItemCount(); + return (album.isCameraRoll() && itemCount > 0) || itemCount == 1; } WeakReference<Toast> mEmptyAlbumToast = null; diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index d7f701ab5..7c7ac6d76 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -407,7 +407,7 @@ public class PhotoPage extends ActivityState implements updateCurrentPhoto(mediaItem); } - mPhotoView.setFilmMode(mStartInFilmstrip); + mPhotoView.setFilmMode(mStartInFilmstrip && mMediaSet.getMediaItemCount() > 1); setupEditButton(); } |