diff options
| author | Owen Lin <owenlin@google.com> | 2012-09-10 21:24:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 21:24:32 -0700 |
| commit | 4e19aebb22c40beb18ed9b5e8d4c0a07e205674e (patch) | |
| tree | 21bb171565bed65aba3e6ce0518a3a51d86365dc | |
| parent | 5251514287e41c57076029b08484d20beb5967b5 (diff) | |
| parent | 0caf3cfbbc1a200e060da11d44f37dc8da4699be (diff) | |
| download | android_packages_apps_Snap-4e19aebb22c40beb18ed9b5e8d4c0a07e205674e.tar.gz android_packages_apps_Snap-4e19aebb22c40beb18ed9b5e8d4c0a07e205674e.tar.bz2 android_packages_apps_Snap-4e19aebb22c40beb18ed9b5e8d4c0a07e205674e.zip | |
Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 8dee15431..c61890c06 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -53,7 +53,6 @@ import com.android.gallery3d.ui.SynchronizedHandler; import com.android.gallery3d.util.Future; import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.HelpUtils; -import com.android.gallery3d.util.MediaSetUtils; import java.lang.ref.WeakReference; @@ -260,7 +259,7 @@ public class AlbumSetPage extends ActivityState implements if (!mGetContent && (targetSet.getSupportedOperations() & MediaObject.SUPPORT_IMPORT) != 0) { data.putBoolean(AlbumPage.KEY_AUTO_SELECT_ALL, true); - } else if (albumShouldOpenInFilmstrip(targetSet)) { + } else if (!mGetContent && albumShouldOpenInFilmstrip(targetSet)) { data.putInt(PhotoPage.KEY_INDEX_HINT, 0); data.putString(PhotoPage.KEY_MEDIA_SET_PATH, mediaPath); |