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 | df6a98a8a7ff8cbbb0fc633ec855c66d4e306fbb (patch) | |
| tree | b6bcce5713aba5cb526e356fbac85c1b676cfe1c /src | |
| parent | 676d4762496eddae66930c6f8b0bae22a22b3ef6 (diff) | |
| parent | 10d8759b5b4d0cf0351bce929eb7b6420aabbfd9 (diff) | |
| download | android_packages_apps_Gallery2-df6a98a8a7ff8cbbb0fc633ec855c66d4e306fbb.tar.gz android_packages_apps_Gallery2-df6a98a8a7ff8cbbb0fc633ec855c66d4e306fbb.tar.bz2 android_packages_apps_Gallery2-df6a98a8a7ff8cbbb0fc633ec855c66d4e306fbb.zip | |
Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
Diffstat (limited to 'src')
| -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); |